From a2646db69bc0cd6b0fa09a72c5243ac2126f57e8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 5 Jul 2019 16:01:01 +0100 Subject: [PATCH] dgit: rpush: Move push_parse_dsc earlier We are going to want this information sooner. No overall functional change. Signed-off-by: Ian Jackson --- dgit | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dgit b/dgit index 6d9a8045..a8968478 100755 --- a/dgit +++ b/dgit @@ -5182,6 +5182,7 @@ sub i_resp_previously ($) { } our %i_wanted; +our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos); sub i_resp_want ($) { my ($keyword) = @_; @@ -5191,8 +5192,11 @@ sub i_resp_want ($) { $isuite = $i_param{'isuite'} // $i_param{'csuite'}; die unless $isuite =~ m/^$suite_re$/; - pushing(); - rpush_handle_protovsn_bothends(); + if (!defined $dsc) { + pushing(); + rpush_handle_protovsn_bothends(); + push_parse_dsc $i_dscfn, 'remote dsc', $i_version; + } my @localpaths = i_method "i_want", $keyword; printdebug "[[ $keyword @localpaths\n"; @@ -5202,8 +5206,6 @@ sub i_resp_want ($) { print RI "files-end\n" or confess "$!"; } -our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos); - sub i_localname_parsed_changelog { return "remote-changelog.822"; } @@ -5271,7 +5273,7 @@ sub i_want_signed_tag { die unless $i_param{'csuite'} =~ m/^$suite_re$/; $csuite = $&; - push_parse_dsc $i_dscfn, 'remote dsc', $i_version; + defined $dsc or badproto \*RO, "dsc (before parsed-changelog)"; my @tagwants = push_tagwants $i_version, $head, $maintview, "tag"; -- 2.30.2