/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/init.py

  • Committer: Tim Marston
  • Date: 2016-02-13 14:18:32 UTC
  • Revision ID: tim@ed.am-20160213141832-o0odt4p3nuj97211
switched init command (and update command) to checking for conflicts prior to
deployment.copy_out(), and removed remaining references to CopyInConflict
(supposedly done in r24)

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/init.py
106
106
 
107
107
                                raise e
108
108
 
 
109
                        # check for deployment conclicts
 
110
                        conflicts = deployment.get_conflicts()
 
111
                        if conflicts:
 
112
                                message += 'deployment conflicts:\n  %s' % \
 
113
                                                   '\n  '.join( conflicts )
 
114
 
109
115
                        # perform deployment
110
 
                        try:
111
 
                                deployment.copy_out()
112
 
                        except deployment.Conflict as e:
113
 
                                raise the.program.FatalError( e.msg )
 
116
                        deployment.copy_out()
114
117
 
115
118
                else:
116
119