/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/command/update.py

  • Committer: Tim Marston
  • Date: 2014-03-19 20:02:10 UTC
  • Revision ID: tim@ed.am-20140319200210-b6nm63rpktfmw0l3
changed working of output

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py
118
118
                # check for conflicts in repo
119
119
                files = the.repo.vcs.get_conflicts()
120
120
                if files:
121
 
                        message += 'Conflicts in %s:\n  %s' % \
 
121
                        message += 'conflicts in %s:\n  %s' % \
122
122
                                           ( the.repo.name, '\n  '.join( files ) )
123
123
 
124
124
                # check for deployment conclicts
125
125
                conflicts = deployment.get_conflicts( updated_files )
126
126
                if conflicts:
127
 
                        message += 'Deployment conflicts:\n  %s' % \
 
127
                        message += 'deployment conflicts:\n  %s' % \
128
128
                                           '\n  '.join( conflicts )
129
129
 
130
130
                # stop if there are conflicts