/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/vcs/bzr.py

  • Committer: Tim Marston
  • Date: 2016-05-22 16:58:00 UTC
  • Revision ID: tim@ed.am-20160522165800-2wouy6ybo2cunqb6
fixed bzr backend detection of out-of-date working copy

Show diffs side-by-side

added added

removed removed

lib/stdhome/vcs/bzr.py
290
290
                try:
291
291
                        self.run( [ 'bzr', 'commit', '-m', '' ] )
292
292
                except self.VcsError as e:
293
 
                        if re.search( '/Working tree is out of date, please/', e.output ):
 
293
                        if re.search( 'Working tree is out of date', e.output ):
294
294
                                raise the.program.FatalError(
295
295
                                        'you must update your files first.\n' +
296
296
                                        'Hint: see "%s update --help"' % the.program.name );
 
297
                        else:
 
298
                                raise e
297
299
 
298
300
 
299
301
        def run( self, cmd ):