/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/deployment.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/deployment.py
220
220
                                self.msg = "there is an ongoing deployment"
221
221
                        else:
222
222
                                self.msg = "there is no ongoing deployment"
223
 
 
224
 
 
225
 
        class CopyInConflicts( the.program.FatalError ):
226
 
 
227
 
                def __init__( self, conflicts ):
228
 
                        self.conflicts = conflicts