Mercurial > gub
changeset 3453:12f3f2b0a16b
Better oslog substitutions for repository. Make rsync verbosity
listen to options.verbose. Bugfix for gub-tester --update.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Wed, 09 May 2007 13:28:16 +0200 |
| parents | bbb361d4d1d9 |
| children | 07510997bd2f |
| files | bin/gub-tester gub/gubb.py gub/repository.py |
| diffstat | 3 files changed, 23 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/gub-tester Wed May 09 13:08:30 2007 +0200 +++ b/bin/gub-tester Wed May 09 13:28:16 2007 +0200 @@ -159,7 +159,7 @@ help='where to fetch sources') p.add_option ('--update', - action='store', + action='store_true', dest='update', default=False, help='checkout or update sources') @@ -242,7 +242,7 @@ logfile = 'test-%(canonicalize)s.log' % locals () logfile = os.path.join (options.result_dir, logfile) - cmd = 'nice time %(target)s > %(logfile)s 2>&1' % locals () + cmd = '(nice time %(target)s) > %(logfile)s 2>&1' % locals () log_file.log (cmd)
--- a/gub/gubb.py Wed May 09 13:08:30 2007 +0200 +++ b/gub/gubb.py Wed May 09 13:28:16 2007 +0200 @@ -620,9 +620,7 @@ # TODO: junk this, always set repo in __init__ def with_vc (self, repo): self.vc_repository = repo - self.vc_repository.system = self.os_interface.system - self.vc_repository.read_pipe = self.os_interface.read_pipe - self.vc_repository.download_url = self.os_interface.download_url + self.vc_repository.set_oslog (self.os_interface) return self def with_tarball (self, mirror='', version='', format='gz', strip_components=1, name=''):
--- a/gub/repository.py Wed May 09 13:08:30 2007 +0200 +++ b/gub/repository.py Wed May 09 13:28:16 2007 +0200 @@ -38,11 +38,19 @@ self.dir = os.path.join (os.getcwd (), self.vcs) self .source = source + self.oslog = None # Fallbacks, this will go through oslog self.system = misc.system self.read_pipe = misc.read_pipe self.download_url = misc.download_url + def set_oslog (self, oslog): + # Fallbacks, this will go through oslog + self.oslog = oslog + self.system = oslog.system + self.read_pipe = oslog.read_pipe + self.download_url = oslog.download_url + def download (self): pass @@ -148,7 +156,10 @@ self.system ('mkdir -p %(destdir)s' % locals ()) dir = self.dir - self.system ('rsync --exclude _darcs -av %(dir)s/* %(destdir)s/' % locals()) + verbose = '' + if self.oslog and self.oslog.verbose >= self.oslog.commands: + verbose = 'v' + self.system ('rsync --exclude _darcs -a%(verbose)s %(dir)s/* %(destdir)s/' % locals()) def get_file_content (self, file): dir = self.dir @@ -494,7 +505,10 @@ def update_workdir (self, destdir): dir = self._checkout_dir () ## TODO: can we get deletes from vc? - self.system ('rsync -av --delete --exclude CVS %(dir)s/ %(destdir)s' % locals ()) + verbose = '' + if self.oslog and self.oslog.verbose >= self.oslog.commands: + verbose = 'v' + self.system ('rsync -a%(verbose)s --delete --exclude CVS %(dir)s/ %(destdir)s' % locals ()) def is_downloaded (self): dir = self._checkout_dir () @@ -586,7 +600,10 @@ def _copy_working_dir (self, dir, copy): repository = self.vcs - self.system ('rsync -av --exclude %(repository)s %(dir)s/ %(copy)s' + verbose = '' + if self.oslog and self.oslog.verbose >= self.oslog.commands: + verbose = 'v' + self.system ('rsync -a%(verbose)s --exclude %(repository)s %(dir)s/ %(copy)s' % locals ()) def _checkout_dir (self):