/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-04-18 15:00:34 UTC
  • Revision ID: tim@ed.am-20140418150034-l94wfs6ururhi9t5
fixed error in walker.py (from last checkin)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/init.py
23
23
from command import Command
24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
 
26
from stdhome.subprocess import Popen
26
27
 
27
28
 
28
29
class InitCommand( Command ):
41
42
                print "hostname, it is internally expanded to scp://HOSTNAME/~/.stdhome/REPO)."
42
43
                print
43
44
                print "Options:"
44
 
                print "      --quiet      do not report changes to the home directory"
45
45
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
46
46
                print "  -v, --verbose    display information about what is being done"
47
47
                print "      --help       display help and exit"
51
51
        def parse_command_line( self ):
52
52
                opts, args = getopt.gnu_getopt(
53
53
                        sys.argv[ 1: ], "r:v",
54
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
54
                        [ "repo=", "verbose", "help" ] )
55
55
                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 ):
 
56
                        if opt in [ '--repo', '-r' ]:
 
57
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
60
58
                                        raise the.program.FatalError(
61
59
                                                'invalid repository name: ' + optarg )
62
60
                                the.repo = optarg
 
61
                        elif opt in [ '--verbose', '-v' ]:
 
62
                                the.verbose += 1
63
63
                        elif opt == "--help":
64
64
                                self.print_help()
65
 
 
 
65
                
66
66
                # discard first argument (the command)
67
67
                args.pop( 0 )
68
68
 
87
87
                if self.url:
88
88
 
89
89
                        # expand url if it's a simple hostname
90
 
                        if re.search( '^[0-9a-zA-z.]+$', self.url ):
91
 
                                self.url = 'bzr+ssh://%s/%s/%s' % \
 
90
                        if re.match( '^[0-9a-zA-z.]+$', self.url ):
 
91
                                self.url = 'sftp://%s/%s/%s' % \
92
92
                                                   ( self.url, the.dir, the.repo.name )
93
93
 
94
94
                        # initialise deployment (with an empty repo)
109
109
 
110
110
                                raise e
111
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
 
 
125
112
                        # perform deployment
126
 
                        deployment.copy_out( self.quiet )
 
113
                        try:
 
114
                                deployment.copy_out()
 
115
                        except deployment.Conflict as e:
 
116
                                raise the.program.FatalError( e.msg )
127
117
 
128
118
                else:
129
119