resolving merge conflicts

2014-07-21 13:42:06 -04:00
parent 0d5c6ba3ce a03134b371
commit 7023eb4c19
7 changed files with 127 additions and 14 deletions
--- a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
@@ -632,7 +632,12 @@ class DraftModuleStore(MongoModuleStore):
            """
            Depth first publishing from the given location
            """
-            item = self.get_item(item_location)
+            try:
+                # handle child does not exist w/o killing publish
+                item = self.get_item(item_location)
+            except ItemNotFoundError:
+                log.warning('Cannot find: %s', item_location)
+                return

            # publish the children first
            if item.has_children: