From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 Sep 2013 23:09:25 +0000 (+0100)
Subject: break out shell_cmd
X-Git-Tag: debian/0.15~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=66594ad255963a63ee55caa88ce5fa3a2b5954a1;hp=8d37038bddb78dbe6dcf1c1e2bc515c1dcd7002c

break out shell_cmd
---

diff --git a/dgit b/dgit
index f77d349b..9768fe93 100755
--- a/dgit
+++ b/dgit
@@ -209,6 +209,11 @@ sub runcmd_ordryrun {
     }
 }
 
+sub shell_cmd {
+    my ($first_shell, @cmd) = @_;
+    return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
+}
+
 our $helpmsg = <<END;
 main usages:
   dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
@@ -660,8 +665,7 @@ sub ensure_we_have_orig () {
 	$origurl .= "/$f";
 	die "$f ?" unless $f =~ m/^${package}_/;
 	die "$f ?" if $f =~ m#/#;
-	runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
-	    @dget,'--',$origurl;
+	runcmd_ordryrun shell_cmd 'cd ..', @dget,'--',$origurl;
     }
 }