/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 13:20:44 UTC
  • Revision ID: tim@ed.am-20160213132044-t5zaxhdlhjyn4t1v
moved handling of --verbose to main program; manuall parse config file (because
ConfigFileParse does not support allow_no_value in python 2.6)

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
 
 
115
109
                        # perform deployment
116
 
                        deployment.copy_out()
 
110
                        try:
 
111
                                deployment.copy_out()
 
112
                        except deployment.Conflict as e:
 
113
                                raise the.program.FatalError( e.msg )
117
114
 
118
115
                else:
119
116