summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-01-18 22:58:06 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-03-05 18:29:03 +0000
commit4143231b728a6dc0d6d806b8b585f584824a1774 (patch)
treee22f586466d30602fcbf6dc8d9295aec3a91f24a
parent29908c01094cb4d7be004bfb293e2f7214aabcd7 (diff)
Move dsc handling together for clarity. NFC.
-rwxr-xr-xdgit13
1 files changed, 5 insertions, 8 deletions
diff --git a/dgit b/dgit
index 4c69b95..34257de 100755
--- a/dgit
+++ b/dgit
@@ -1438,20 +1438,17 @@ sub dopush () {
"HEAD:".rrref(), "refs/tags/$tag";
runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
- if (!$we_are_responder) {
- if (act_local()) {
- rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
- } else {
- progress "[new .dsc left in $dscpath.tmp]";
- }
- }
-
if ($we_are_responder) {
my $dryrunsuffix = act_local() ? "" : ".tmp";
responder_receive_files('signed-dsc-changes',
"$dscpath$dryrunsuffix",
"$changesfile$dryrunsuffix");
} else {
+ if (act_local()) {
+ rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
+ } else {
+ progress "[new .dsc left in $dscpath.tmp]";
+ }
sign_changes $changesfile;
}