From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Aug 2014 16:09:43 +0000 (+0100)
Subject: getcwd: Introduce must_getcwd using getcwd rather than cmdoutput
X-Git-Tag: debian/0.22~36
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a687e0b6a3ac727f4b40f042265093699717251e;hp=87706b323ead6f88ecbcef49249d811989184a2d

getcwd: Introduce must_getcwd using getcwd rather than cmdoutput
---

diff --git a/dgit b/dgit
index 6369856c..86613399 100755
--- a/dgit
+++ b/dgit
@@ -623,6 +623,12 @@ sub git_get_ref ($) {
     }
 }
 
+sub must_getcwd () {
+    my $d = getcwd();
+    defined $d or fail "getcwd failed: $!";
+    return $d;
+}
+
 our %rmad;
 
 sub archive_query ($) {
@@ -1915,7 +1921,7 @@ sub build_source {
 	runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
 	    changesopts();
     } else {
-	my $pwd = cmdoutput qw(env - pwd);
+	my $pwd = must_getcwd();
 	my $leafdir = basename $pwd;
 	changedir "..";
 	runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;