Ignore:
Timestamp:
Sep 24, 2009 10:25:38 PM (15 years ago)
Author:
retracile
Message:

Ticket #2: merge to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • mergebot/trunk/mergebot/MergeActor.py

    r17 r24  
    2626
    2727        # Make sure the various urls we require do exist
    28         if not SvnOps.get_branch_info(self.local_url(), logfile):
    29             comment = 'Component %s does not exist in the repository.' \
    30                 % self.component
    31             return results, comment, False
    32         if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
    33             comment = 'No directory in which to create branches for component %s in the repository.' % self.component
    34             return results, comment, False
    35         if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
    36             comment = 'Version %s for component %s does not exist in the repository.' % (self.version, self.component)
    37             return results, comment, False
     28        problems = self.check_required_directories()
     29        if problems:
     30            return results, problems, False
    3831
    3932        rev_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
    4033        if not rev_info:
    41             comment = 'Branch for ticket %s does not exist in the repository.' % (self.ticket)
     34            comment = 'Branch for ticket %s does not exist in the repository.' \
     35                % (self.ticket)
    4236            return results, comment, False
    4337        startrev, endrev = rev_info
Note: See TracChangeset for help on using the changeset viewer.