Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coreos-ostree-importer: fix more variable bugs #104

Merged
merged 1 commit into from
Apr 22, 2020
Merged

coreos-ostree-importer: fix more variable bugs #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions coreos-ostree-importer/coreos_ostree_importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,11 @@ def process(self, message: fedora_messaging.api.Message):
# sometimes we do multiple builds for a stream (which get imported
# into the compose repo) before we actually do a release.
if target_repo != "compose" and has_parent_commit and branch_exists:
parent = ostree_get_parent_commit(repo=srcrepo, commit=commit)
assert_branch_points_to_commit(repo=dstrepo, branch=branch, commit=parent)
parent = ostree_get_parent_commit(repo=source_repo_path,
commit=ostree_checksum)
assert_branch_points_to_commit(repo=target_repo_path,
branch=ostree_ref,
commit=parent)

# Import the commit into the target repo
ostree_pull_local(
Expand Down