/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: 2014-07-30 19:08:15 UTC
  • Revision ID: tim@ed.am-20140730190815-f3fs5cgtwb88jbvb
added checks to not die when information is missing in deployment

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/init.py
57
57
                                        raise the.program.FatalError(
58
58
                                                'invalid repository name: ' + optarg )
59
59
                                the.repo = optarg
 
60
                        elif opt in [ '--verbose', '-v' ]:
 
61
                                the.verbose += 1
60
62
                        elif opt == "--help":
61
63
                                self.print_help()
62
 
 
 
64
                
63
65
                # discard first argument (the command)
64
66
                args.pop( 0 )
65
67
 
106
108
 
107
109
                                raise e
108
110
 
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
111
                        # perform deployment
116
 
                        deployment.copy_out()
 
112
                        try:
 
113
                                deployment.copy_out()
 
114
                        except deployment.Conflict as e:
 
115
                                raise the.program.FatalError( e.msg )
117
116
 
118
117
                else:
119
118