chiark / gitweb /
dsc import: Do not look anything up in default distro
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jan 2017 12:00:45 +0000 (12:00 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 9 Jan 2017 02:20:09 +0000 (02:20 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index d771ce1067d20973b98e31335881ad78d1526707..35a2b37c6c37302862fa79935b470d8844fcc650 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2823,8 +2823,12 @@ END
        return $lrf;
     };
 
        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';
        my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
        $mapref = $lrf.'/'.$rewritemap;
        my $rewritemapdata = git_cat_file $mapref.':map';