/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-23 19:35:21 UTC
  • Revision ID: tim@ed.am-20160223193521-2vgtxbfos50rrpku
renamed version -> VERSION

Show diffs side-by-side

added added

removed removed

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