/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:30:50 UTC
  • Revision ID: tim@ed.am-20160213133050-4xw8cgs2lp34zq9c
remove set declaration syntax (not compatible w/ python 2.6)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/init.py
106
106
 
107
107
                                raise e
108
108
 
109
 
                        message = ''
110
 
 
111
 
                        # check for deployment conclicts
112
 
                        conflicts = deployment.get_conflicts()
113
 
                        if conflicts:
114
 
                                message += 'deployment conflicts:\n  %s' % \
115
 
                                                   '\n  '.join( conflicts )
116
 
 
117
 
                        # stop if there are conflicts
118
 
                        if message:
119
 
                                raise the.program.FatalError(
120
 
                                        'there were conflicts...\n' + message )
121
 
 
122
109
                        # perform deployment
123
 
                        deployment.copy_out()
 
110
                        try:
 
111
                                deployment.copy_out()
 
112
                        except deployment.Conflict as e:
 
113
                                raise the.program.FatalError( e.msg )
124
114
 
125
115
                else:
126
116