From cb06875b34baa35c9193f3c31a46e9be0af10a61 Mon Sep 17 00:00:00 2001
From: Matthew Vernon <mv3@sanger.ac.uk>
Date: Fri, 19 Jul 2019 10:13:24 +0100
Subject: [PATCH] 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>
---
 dgit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dgit b/dgit
index 0d7c62d7..398dad55 100755
--- a/dgit
+++ b/dgit
@@ -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
 	}
     }
-- 
2.30.2