diff options
author | Matthew Vernon <mv3@sanger.ac.uk> | 2019-07-19 10:13:24 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-19 22:57:36 +0100 |
commit | cb06875b34baa35c9193f3c31a46e9be0af10a61 (patch) | |
tree | d6f3fb24d3a37f8c59139db42d37aa1ac4ad282d | |
parent | 39b39996ff4a9e8447eac015fa98900e2bf11c95 (diff) |
dgit: move suite name check to after suite rmap
The Ubuntu Cloud Archive has Codenames of the form
bionic-updates/train (the / in which suitere doesn't match); this can
be corrected by suite rmap, so apply that before doing the suitere
sanity check.
Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1435,11 +1435,11 @@ sub canonicalise_suite_aptget { my $val = $release->{$name}; if (defined $val) { printdebug "release file $name: $val\n"; + cfg_apply_map(\$val, 'suite rmap', + access_cfg('aptget-suite-rmap', 'RETURN-UNDEF')); $val =~ m/^$suite_re$/o or fail f_ "Release file (%s) specifies intolerable %s", $aptget_releasefile, $name; - cfg_apply_map(\$val, 'suite rmap', - access_cfg('aptget-suite-rmap', 'RETURN-UNDEF')); return $val } } |