/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/update.py

  • Committer: Tim Marston
  • Date: 2016-02-13 13:30:50 UTC
  • Revision ID: tim@ed.am-20160213133050-4xw8cgs2lp34zq9c
remove set declaration syntax (not compatible w/ python 2.6)

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py
71
71
                                        raise the.program.FatalError(
72
72
                                                'invalid repository name: ' + optarg )
73
73
                                the.repo = optarg
74
 
                        elif opt in [ '--verbose', '-v' ]:
75
 
                                the.verbose += 1
76
74
                        elif opt == "--help":
77
75
                                self.print_help()
78
 
                
 
76
 
79
77
                # discard first argument (the command)
80
78
                args.pop( 0 )
81
79
 
97
95
                if the.repo.vcs.has_changes():
98
96
                        raise the.program.FatalError(
99
97
                                'repo has local changes: %s\n'
100
 
                                'Hint: see "%s stage-revert --help"' % 
 
98
                                'Hint: see "%s stage-revert --help"' %
101
99
                                ( the.repo.name, the.program.name ) )
102
100
 
103
101
                # copy-in changes to repo
109
107
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
110
108
 
111
109
                # perform vcs update
112
 
                if the.verbose: print "updating %s" % the.repo.dir
 
110
                if the.verbose >= 1: print "updating %s" % the.repo.dir
113
111
                updated_files = the.repo.vcs.update()
114
112
 
115
113
                message = ''
134
132
                deployment.copy_out()
135
133
 
136
134
                # now we've copied-out, revert any copied-in changes!
137
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
135
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
138
136
                the.repo.vcs.revert()