/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
41
41
                print "hostname, it is internally expanded to scp://HOSTNAME/~/.stdhome/REPO)."
42
42
                print
43
43
                print "Options:"
44
 
                print "      --quiet      do not report changes to the home directory"
45
44
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
46
45
                print "  -v, --verbose    display information about what is being done"
47
46
                print "      --help       display help and exit"
51
50
        def parse_command_line( self ):
52
51
                opts, args = getopt.gnu_getopt(
53
52
                        sys.argv[ 1: ], "r:v",
54
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
53
                        [ "repo=", "verbose", "help" ] )
55
54
                for opt, optarg in opts:
56
 
                        if opt == "--quiet":
57
 
                                self.quiet = True
58
 
                        elif opt in [ '--repo', '-r' ]:
59
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
55
                        if opt in [ '--repo', '-r' ]:
 
56
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
60
57
                                        raise the.program.FatalError(
61
58
                                                'invalid repository name: ' + optarg )
62
59
                                the.repo = optarg
 
60
                        elif opt in [ '--verbose', '-v' ]:
 
61
                                the.verbose += 1
63
62
                        elif opt == "--help":
64
63
                                self.print_help()
65
 
 
 
64
                
66
65
                # discard first argument (the command)
67
66
                args.pop( 0 )
68
67
 
87
86
                if self.url:
88
87
 
89
88
                        # expand url if it's a simple hostname
90
 
                        if re.search( '^[0-9a-zA-z.]+$', self.url ):
 
89
                        if re.match( '^[0-9a-zA-z.]+$', self.url ):
91
90
                                self.url = 'bzr+ssh://%s/%s/%s' % \
92
91
                                                   ( self.url, the.dir, the.repo.name )
93
92
 
109
108
 
110
109
                                raise e
111
110
 
112
 
                        message = ''
113
 
 
114
 
                        # check for deployment conclicts
115
 
                        conflicts = deployment.get_conflicts()
116
 
                        if conflicts:
117
 
                                message += 'deployment conflicts:\n  %s' % \
118
 
                                                   '\n  '.join( conflicts )
119
 
 
120
 
                        # stop if there are conflicts
121
 
                        if message:
122
 
                                raise the.program.FatalError(
123
 
                                        'there were conflicts...\n' + message )
124
 
 
125
111
                        # perform deployment
126
 
                        deployment.copy_out( self.quiet )
 
112
                        try:
 
113
                                deployment.copy_out()
 
114
                        except deployment.Conflict as e:
 
115
                                raise the.program.FatalError( e.msg )
127
116
 
128
117
                else:
129
118