diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-19 11:18:21 +0100 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-19 11:18:21 +0100 |
commit | 9804015ba88164ce5634373970092ce60c6efdf6 (patch) | |
tree | 369e0d60ffeb96a1b0531b8350a50f00c71e63da | |
parent | af11b82dfb2baf7d868bb84b86ae8a769dad03f9 (diff) | |
download | lorry-9804015ba88164ce5634373970092ce60c6efdf6.tar.gz |
Try and make it so later tarball lorrying still works
-rwxr-xr-x | lorry | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -369,21 +369,21 @@ class Lorry(cliapp.Application): if not os.path.exists(gitdir): self.run_program(['git', 'init', gitdir]) - cmdline = ['tar', '--extract', '--file', tardest] - # compression is handled in long form, so use gzip instead of z - try: - cmdline += ['--' + spec['compression']] - except KeyError: - pass - # tarballs often have a directory on top, strip = 1 will remove it - try: - cmdline += ['--strip-components', str(spec['strip'])] - except KeyError: - pass - self.run_program(cmdline, cwd=gitdir) - self.run_program(['git', 'add', '.'], cwd=gitdir) - self.run_program(['git', 'commit', '-m', 'Tarball conversion'], - cwd=gitdir) + cmdline = ['tar', '--extract', '--file', tardest] + # compression is handled in long form, so use gzip instead of z + try: + cmdline += ['--' + spec['compression']] + except KeyError: + pass + # tarballs often have a directory on top, strip = 1 will remove it + try: + cmdline += ['--strip-components', str(spec['strip'])] + except KeyError: + pass + self.run_program(cmdline, cwd=gitdir) + self.run_program(['git', 'add', '.'], cwd=gitdir) + self.run_program(['git', 'commit', '-m', 'Tarball conversion'], + cwd=gitdir) def push_to_mirror_server(self, name, gitdir, |