From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jan 2017 12:00:45 +0000 (+0000)
Subject: dsc import: Do not look anything up in default distro
X-Git-Tag: archive/debian/3.0~50
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ed1a06f3b3d8a6a5435441d9f7849035fe4db31b

dsc import: Do not look anything up in default distro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index d771ce10..35a2b37c 100755
--- a/dgit
+++ b/dgit
@@ -2823,8 +2823,12 @@ END
 	return $lrf;
     };
 
-    if (parse_cfg_bool 'rewrite-map-enable', 'true',
-	    access_cfg('rewrite-map-enable', 'RETURN-UNDEF')) {
+    my $rewrite_enable = do {
+	local $idistro = $dsc_distro;
+	access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
+    };
+
+    if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
 	my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
 	$mapref = $lrf.'/'.$rewritemap;
 	my $rewritemapdata = git_cat_file $mapref.':map';