/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-04-05 22:26:17 UTC
  • Revision ID: tim@ed.am-20140405222617-4nf4alk3u2dxe430
removed reference to copy-in conflicts (which no longer exist)

Show diffs side-by-side

added added

removed removed

lib/stdhome/deployment.py
156
156
                        if the.verbose: print "importing files..."
157
157
                        walker = CopyInWalker()
158
158
                        walker.walk()
159
 
                        if( walker.changed ):
160
 
                                raise self.CopyInConflicts( walker.changed )
161
159
                        self.deploy_files = walker.walk_list
162
160
 
163
161
                        # obtain initial revno