diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-05 22:41:16 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-11 18:56:03 +0100 |
commit | fe2c39524a6c74aed1f21f0e3eaafc332c46843c (patch) | |
tree | f390c5406dab3e368a8c4d2bc232109dec6d8bec | |
parent | 667a6e28ae4f2bc17b6dfb54a859ba197914c103 (diff) |
dgit: With sbuild, unapply patches in right dir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 $!; } |