Fix error on no-op mirror sync

backports: #8999 https://pulp.plan.io/issues/8999 fixes #9060 (cherry picked from commit f73bc65)
pulp · Jul 21, 2021 · 123a437 · 123a437
1 parent 02c8767
commit 123a437
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES/9060.bugfix b/CHANGES/9060.bugfix
@@ -0,0 +1,2 @@
+Fix an issue where "mirror=True" syncs of a repository which has already been synced, and has not changed since the last sync, would fail.
+(backported from #8999)
diff --git a/pulp_file/app/tasks/synchronizing.py b/pulp_file/app/tasks/synchronizing.py
@@ -48,7 +48,7 @@ def synchronize(remote_pk, repository_pk, mirror):
     first_stage = FileFirstStage(remote)
     dv = DeclarativeVersion(first_stage, repository, mirror=mirror)
     rv = dv.create()
-    if mirror:
+    if rv and mirror:
         # TODO: this is awful, we really should rewrite the DeclarativeVersion API to
         # accomodate this use case
         global metadata_files