Merge pull request #104 from dustymabe/dusty-fix-importer

coreos-ostree-importer: fix more variable bugs
coreos · Apr 22, 2020 · e4d7735 · e4d7735
2 parents cb185c2 + b5d71f9
commit e4d7735
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/coreos-ostree-importer/coreos_ostree_importer.py b/coreos-ostree-importer/coreos_ostree_importer.py
@@ -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(