Changes in mergebot/trunk/mergebot/MergeActor.py [17:24]

File:

• mergebot/trunk/mergebot/MergeActor.py (modified) (1 diff)

mergebot/trunk/mergebot/MergeActor.py

@@ -26 +26 @@
 
         # Make sure the various urls we require do exist
-        if not SvnOps.get_branch_info(self.local_url(), logfile):
-            comment = 'Component %s does not exist in the repository.' \
-                % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
-            comment = 'No directory in which to create branches for component %s in the repository.' % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
-            comment = 'Version %s for component %s does not exist in the repository.' % (self.version, self.component)
-            return results, comment, False
+        problems = self.check_required_directories()
+        if problems:
+            return results, problems, False
 
         rev_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
         if not rev_info:
-            comment = 'Branch for ticket %s does not exist in the repository.' % (self.ticket)
+            comment = 'Branch for ticket %s does not exist in the repository.' \
+                % (self.ticket)
             return results, comment, False
         startrev, endrev = rev_info