diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 16:14:21 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 16:14:22 +0000 |
commit | a35c6336ebc9976853dfe46988866642da1994ec (patch) | |
tree | e2d4df597add422a61678a762d3b127229b2fe02 /dgit | |
parent | f2cadf83bd6d93d0a483da509e724358a4a72a44 (diff) |
dgit: rpush: Use $isuite for $isuite, not $csuite
Send isuite as a parameter, and use it if it's provided, instead of
csuite. This means config lookups like
dgit-distro.SUITE.distro
only need the user-provided suite name (eg `unstable'), and don't need
to be duplicated for the canonical name (eg `sid').
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -4136,6 +4136,7 @@ END responder_send_file('changes',$changesfile); responder_send_command("param head $dgithead"); responder_send_command("param csuite $csuite"); + responder_send_command("param isuite $isuite"); responder_send_command("param tagformat $tagformat"); if (defined $maintviewhead) { die unless ($protovsn//4) >= 4; @@ -4539,7 +4540,8 @@ sub i_resp_want ($) { die "$keyword ?" if $i_wanted{$keyword}++; defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite"; - $isuite = $i_param{'csuite'}; + $isuite = $i_param{'isuite'} // $i_param{'csuite'}; + die unless $isuite =~ m/^$suite_re$/; pushing(); rpush_handle_protovsn_bothends(); |