[debrepatch] 01/02: Shorter var name

Ximin Luo infinity0 at debian.org
Wed Jun 21 12:20:53 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository debrepatch.

commit d5ee187f5e9697f0556d72ac1f7f8c72d4267da9
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Jun 21 13:59:26 2017 +0200

    Shorter var name
---
 debpatch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debpatch b/debpatch
index f3e006e..eb522f2 100755
--- a/debpatch
+++ b/debpatch
@@ -243,15 +243,16 @@ def main(args):
         os.chdir(args.orig_dsc_or_dir)
         debpatch(patch, patch_name, args)
     elif os.path.isfile(args.orig_dsc_or_dir):
-        parts = os.path.splitext(os.path.basename(args.orig_dsc_or_dir))
+        dscfile = args.orig_dsc_or_dir
+        parts = os.path.splitext(os.path.basename(dscfile))
         if parts[1] != ".dsc":
-            raise ValueError("unrecognised patch target: %s" % args.orig_dsc_or_dir)
+            raise ValueError("unrecognised patch target: %s" % dscfile)
         extractdir = args.directory if args.directory else tempfile.mkdtemp()
         if not os.path.isdir(extractdir):
             os.makedirs(extractdir)
         try:
             builddir = os.path.join(extractdir, parts[0]) # dpkg-source doesn't like existing dirs
-            C(["dpkg-source", "-x", "--skip-patches", args.orig_dsc_or_dir, builddir], stdout=stdout)
+            C(["dpkg-source", "-x", "--skip-patches", dscfile, builddir], stdout=stdout)
             origdir = os.getcwd()
             os.chdir(builddir)
             did_patch = debpatch(patch, patch_name, args)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git



More information about the Reproducible-commits mailing list