From ede2bc2d0a8c8ff3c5f5a867aacbdf94c0f3b1f6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 10 Apr 2007 13:39:56 +0000 Subject: [PATCH] debian/bin/genorig.py - Fix detection of uncompressed patch files. - Create output directory. svn path=/dists/trunk/linux-2.6/; revision=8455 --- debian/bin/genorig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py index 359a7cb5f..8d259d911 100755 --- a/debian/bin/genorig.py +++ b/debian/bin/genorig.py @@ -47,7 +47,7 @@ class main(object): if self.input_patch is None: return self.log("Patching source with %s\n" % self.input_patch) - match = re.match(r'(^|.*/)(patch-\d+\.\d+\.\d+(-\S+)?(\.(?P(bz2|gz))))?$', self.input_patch) + match = re.match(r'(^|.*/)patch-\d+\.\d+\.\d+(-\S+?)?(\.(?P(bz2|gz)))?$', self.input_patch) if not match: raise RuntimeError("Can't identify name of patch") cmdline = [] @@ -64,6 +64,7 @@ class main(object): def tar(self): out = os.path.join("../orig", self.orig_tar) + os.mkdir("../orig") self.log("Generate tarball %s\n" % out) cmdline = ['tar -czf', out, '-C', self.dir, self.orig] if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]):