/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-09 01:57:23 UTC
  • Revision ID: tim@ed.am-20140309015723-kwd7kklc76jq0idr
reduced set of available commands to those implemented

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py
107
107
                except deployment.CopyInConflicts as e:
108
108
                        raise the.program.FatalError(
109
109
                                'Files in %s differ too severly from %s:\n  %s\n' % \
110
 
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
 
110
                                ( the.hdir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
111
111
 
112
112
                # perform vcs update
113
113
                if the.verbose: print "updating %s" % the.repo.dir
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