diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-04 11:29:56 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-04 11:29:56 +0000 |
| commit | 28ba7b9e299d9aa54328ee2eaf8c4aac48465289 (patch) | |
| tree | d9a48e2b45c188e1bf081ff999afffcbbd7c123d | |
| parent | c972012707f6555de6cf636d8eb5e2bf6e8ebf87 (diff) | |
| parent | 0830715fd71e0412a08adfe4a00866ec04ffff4a (diff) | |
| download | lorry-28ba7b9e299d9aa54328ee2eaf8c4aac48465289.tar.gz | |
Merge branch 'sam/no-default-mirror-url'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
| -rwxr-xr-x | lorry | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -58,15 +58,12 @@ class Lorry(cliapp.Application): metavar='DIR', default='workd') self.settings.string(['mirror-base-url-push'], 'base URL to use for pushing to the mirror ' - 'server (default: %default)', - metavar='URL', - default='ssh://gitano@roadtrain.codethink.co.uk/delta') + 'server', + metavar='URL') self.settings.string(['mirror-base-url-fetch'], 'base URL to use for bundle names and for ' - 'pulling from the mirror server (default: ' - '%default)', - metavar='URL', - default='git://git.baserock.org/delta') + 'pulling from the mirror server', + metavar='URL') self.settings.boolean(['pull-only'], 'only pull from upstreams, do not push to ' 'the mirror server') @@ -129,6 +126,8 @@ class Lorry(cliapp.Application): def bundle(self, name, gitdir): if self.settings['bundle'] == 'never': return + if len(self.settings['mirror-base-url-fetch']) == 0: return + bundlename = "%s/%s" % (self.settings['mirror-base-url-fetch'], name) path = os.path.join(self.settings['bundle-dest'], quote_url(bundlename)) + '.bndl' @@ -153,6 +152,8 @@ class Lorry(cliapp.Application): def make_tarball(self, name, gitdir): if self.settings['tarball'] == 'never': return + if len(self.settings['mirror-base-url-fetch']) == 0: return + tarballname = "%s/%s" % (self.settings['mirror-base-url-fetch'], name) path = os.path.join(self.settings['tarball-dest'], @@ -250,10 +251,11 @@ class Lorry(cliapp.Application): raise if not self.settings['pull-only']: - if 'refspecs' in spec: - self.push_to_mirror_server(name, gitdir, spec['refspecs']) - else: - self.push_to_mirror_server(name, gitdir) + if len(self.settings['mirror-base-url-push']) > 0: + if 'refspecs' in spec: + self.push_to_mirror_server(name, gitdir, spec['refspecs']) + else: + self.push_to_mirror_server(name, gitdir) if backupdir is not None: self.progress('.. removing %s git repository backup' % name) |