Taught unsafe-advisory-merge error to point out ALLOW-UNSAFE cfg.

closes #8616
pulp · May 18, 2021 · 1e52fd9 · 1e52fd9
1 parent 671bff8
commit 1e52fd9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/CHANGES/8616.misc b/CHANGES/8616.misc
@@ -0,0 +1 @@
+Pointed advisory-merge-error message to the config-option that allows unsafe merges.
diff --git a/pulp_rpm/app/advisory.py b/pulp_rpm/app/advisory.py
@@ -187,7 +187,9 @@ def _do_merge():
                             "but different and intersecting package lists, "
                             "and neither package list is a proper subset of the other. "
                             "At least one of the advisories is wrong. "
-                            "Advisory id: {}"
+                            "To allow this behavior, set "
+                            "ALLOW_AUTOMATIC_UNSAFE_ADVISORY_CONFLICT_RESOLUTION = True (q.v.) "
+                            "in your configuration. Advisory id: {}"
                         ).format(previous_advisory.id)
                     )
         elif previous_pkglist == added_pkglist:
@@ -206,7 +208,9 @@ def _do_merge():
                     "It is likely that they are from two different incompatible remote "
                     "repositories. E.g. RHELX-repo and RHELY-debuginfo repo. "
                     "Ensure that you are adding content for the compatible repositories. "
-                    "Advisory id: {}"
+                    "To allow this behavior, set "
+                    "ALLOW_AUTOMATIC_UNSAFE_ADVISORY_CONFLICT_RESOLUTION = True (q.v.) "
+                    "in your configuration. Advisory id: {}"
                 ).format(previous_advisory.id)
             )
     elif not same_dates and pkgs_intersection:

diff --git a/pulp_rpm/tests/functional/api/test_advisory_upload.py b/pulp_rpm/tests/functional/api/test_advisory_upload.py
@@ -511,6 +511,7 @@ def test_merging(self):
         self.assertTrue(
             "neither package list is a proper subset of the other" in str(ctx.exception)
         )
+        self.assertTrue("ALLOW_AUTOMATIC_UNSAFE_ADVISORY_CONFLICT_RESOLUTION" in str(ctx.exception))
 
         # Fourth upload, intersecting pkglists, expecting three pkgs
         upload = self.do_test_json(advisory=self.CAMEL_BEAR_DOG_JSON, repository=self.repo)

diff --git a/pulp_rpm/tests/functional/api/test_sync.py b/pulp_rpm/tests/functional/api/test_sync.py
@@ -819,11 +819,14 @@ def test_sync_advisory_diff_repo(self):
 
         task_result = exc.exception.task.to_dict()
         error_msg = (
-            "Incoming and existing advisories have the same id but different "
-            "timestamps and non-intersecting package lists. It is likely that they are from "
-            "two different incompatible remote repositories. E.g. RHELX-repo and "
-            "RHELY-debuginfo repo. Ensure that you are adding content for the compatible "
-            "repositories. Advisory id: {}".format(RPM_ADVISORY_TEST_ID)
+            "Incoming and existing advisories have the same id but "
+            "different timestamps and non-intersecting package lists. "
+            "It is likely that they are from two different incompatible remote "
+            "repositories. E.g. RHELX-repo and RHELY-debuginfo repo. "
+            "Ensure that you are adding content for the compatible repositories. "
+            "To allow this behavior, set "
+            "ALLOW_AUTOMATIC_UNSAFE_ADVISORY_CONFLICT_RESOLUTION = True (q.v.) "
+            "in your configuration. Advisory id: {}".format(RPM_ADVISORY_TEST_ID)
         )
         self.assertIn(error_msg, task_result["error"]["description"])