/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 14:21:53 UTC
  • Revision ID: tim@ed.am-20160213142153-68g7pzq0au6bejep
fixed init command

Show diffs side-by-side

added added

removed removed

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