/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: 2014-07-30 19:09:02 UTC
  • Revision ID: tim@ed.am-20140730190902-bkuu372rya4zokm8
added info for add command to --help; fixed bug with add command where all files
in directories could be added to the commit instead of just the ones you've
specified

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