/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-12 21:51:49 UTC
  • Revision ID: tim@ed.am-20140212215149-msaxl7vo98il5i4a
added more commands

Show diffs side-by-side

added added

removed removed

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