From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Sep 2016 21:41:16 +0000 (+0100)
Subject: dgit: With sbuild, unapply patches in right dir
X-Git-Tag: archive/debian/2.0~177
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=fe2c39524a6c74aed1f21f0e3eaafc332c46843c

dgit: With sbuild, unapply patches in right dir

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 8a097da1..95398497 100755
--- a/dgit
+++ b/dgit
@@ -4164,6 +4164,7 @@ sub cmd_sbuild {
 	    " building would result in ambiguity about the intended results"
 	    if @unwanted;
     }
+    my $wasdir = must_getcwd();
     changedir "..";
     if (act_local()) {
 	stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
@@ -4192,6 +4193,7 @@ sub cmd_sbuild {
 	    rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
 	}
     }
+    changedir $wasdir;
     maybe_unapply_patches_again();
     printdone "build successful, results in $multichanges\n" or die $!;
 }