summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-08-24 23:41:14 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-08-24 23:41:14 +0100
commitfe39d5a9511ec7099079059627677cd37bc6510c (patch)
tree63a54e92b8f4cd1ec0dcc5de1f53a80bd04f17cf /dgit
parent1da531d9d1e1ca779d915b23c1036b41fe8bc6fe (diff)
dry run: Do two more operations in the playtree
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit14
1 files changed, 10 insertions, 4 deletions
diff --git a/dgit b/dgit
index 685941b..d8ffdc5 100755
--- a/dgit
+++ b/dgit
@@ -7059,6 +7059,7 @@ sub build_source {
unpack_playtree_need_cd_work($headref);
changedir '..';
}
+ runcmd @cmd, $leafdir;
} else {
$leafdir = basename $maindir;
@@ -7080,13 +7081,18 @@ sub build_source {
}
changedir '..';
+ runcmd_ordryrun_local @cmd, $leafdir;
}
- runcmd_ordryrun_local @cmd, $leafdir;
changedir $leafdir;
- runcmd_ordryrun_local qw(sh -ec),
- 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
- @dpkggenchanges, qw(-S), changesopts();
+ my @gencmd = (qw(sh -ec),
+ 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
+ @dpkggenchanges, qw(-S), changesopts());
+ if (building_source_in_playtree()) {
+ runcmd @gencmd;
+ } else {
+ runcmd_ordryrun_local @gencmd;
+ }
changedir '..';
printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";