/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-02-26 19:15:30 UTC
  • Revision ID: tim@ed.am-20140226191530-6x21vlwto2xx80cd
renamed updated_files to affected_files

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command_update.py
103
103
                # copy-in changes to repo
104
104
                try:
105
105
                        deployment.copy_in()
106
 
                except( deployment.Conflict, deployment.DeploymentOngoing ) as e:
107
 
                        raise the.program.FatalError( e.msg )
 
106
                except deployment.CopyInConflicts as e:
 
107
                        raise the.program.FatalError(
 
108
                                'Files in %s differ too severly from %s:\n  %s\n' % \
 
109
                                ( the.fsdir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
108
110
 
109
111
                # perform vcs update
110
112
                if the.verbose: print "updating %s" % the.repo.dir
111
 
                the.repo.vcs.update()
 
113
                updated_files = the.repo.vcs.update()
112
114
 
113
 
                # check for conflicts
114
115
                message = ''
 
116
 
 
117
                # check for conflicts in repo
115
118
                files = the.repo.vcs.get_conflicts()
116
119
                if files:
117
120
                        message += 'Conflicts in %s:\n  %s' % \
118
121
                                           ( the.repo.name, '\n  '.join( files ) )
119
 
                files = deployment.get_conflicts()
120
 
                if files:
 
122
 
 
123
                # check for deployment conclicts
 
124
                conflicts = deployment.get_conflicts( updated_files )
 
125
                if conflicts:
121
126
                        message += 'Deployment conflicts:\n  %s' % \
122
 
                                           '\n  '.join( files )
 
127
                                           '\n  '.join( conflicts )
 
128
 
 
129
                # stop if there are conflicts
123
130
                if message:
124
131
                        raise the.program.FatalError(
125
132
                                'there were conflicts...\n' + message )
126
133
 
127
134
                # copy-out changes from repo
128
 
                try:
129
 
                        deployment.copy_out()
130
 
                except deployment.Conflict as e:
131
 
                        raise the.program.FatalError( e.msg )
 
135
                deployment.copy_out()
132
136
 
133
137
                # now we've copied-out, revert any copied-in changes!
134
138
                if the.verbose: print "reverting %s" % the.repo.dir