/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: 2016-02-13 13:23:51 UTC
  • Revision ID: tim@ed.am-20160213132351-8ly2s0rtol5w1kpc
fixed syntax error and remove debug print

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/update.py
99
99
                                ( the.repo.name, the.program.name ) )
100
100
 
101
101
                # copy-in changes to repo
102
 
                deployment.copy_in()
 
102
                try:
 
103
                        deployment.copy_in()
 
104
                except deployment.CopyInConflicts as e:
 
105
                        raise the.program.FatalError(
 
106
                                'Files in %s differ too severly from %s:\n  %s\n' % \
 
107
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
103
108
 
104
109
                # perform vcs update
105
110
                if the.verbose >= 1: print "updating %s" % the.repo.dir