From 9804015ba88164ce5634373970092ce60c6efdf6 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 19 Sep 2012 11:18:21 +0100 Subject: Try and make it so later tarball lorrying still works --- lorry | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lorry b/lorry index 1f0580a..29df6dd 100755 --- a/lorry +++ b/lorry @@ -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, -- cgit v1.2.1