Adds check for duplicate unit key

re #1406
pulp · Feb 25, 2016 · 2305d8f · 2305d8f
1 parent a902085
commit 2305d8f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/plugins/pulp_docker/plugins/importers/sync.py b/plugins/pulp_docker/plugins/importers/sync.py
@@ -8,6 +8,8 @@
 import logging
 import os
 
+from mongoengine import NotUniqueError
+
 from pulp.common.plugins import importer_constants
 from pulp.plugins.util import nectar_config, publish_step
 from pulp.server.controllers import repository
@@ -271,7 +273,10 @@ def process_main(self, item):
         :type  item: pulp.server.db.model.FileContentUnit
         """
         item.set_storage_path(item.digest)
-        item.save_and_import_content(os.path.join(self.get_working_dir(), item.digest))
+        try:
+            item.save_and_import_content(os.path.join(self.get_working_dir(), item.digest))
+        except NotUniqueError:
+            item = item.__class__.objects.get(**item.unit_key)
         repository.associate_single_unit(self.get_repo().repo_obj, item)