chiark / gitweb /
Make access_basedistro honour $idistro (i.e. make -d work properly again)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Aug 2014 17:38:22 +0000 (18:38 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Aug 2014 17:38:22 +0000 (18:38 +0100)
dgit

diff --git a/dgit b/dgit
index f9e6d1bc7d9443c3c866e45d3cdf81f000a6e9d9..ae2684b95c485efe91124c1dcf3aa774fd4395bf 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -505,8 +505,14 @@ sub cfg {
 }
 
 sub access_basedistro () {
 }
 
 sub access_basedistro () {
-    return cfg("dgit-suite.$isuite.distro",
-              "dgit.default.distro");
+    if (defined $idistro) {
+       return cfg("dgit-distro.basedistro.distro",
+                  "dgit-suite.$isuite.distro",
+                  'RETURN-UNDEF') // $idistro;
+    } else {   
+       return cfg("dgit-suite.$isuite.distro",
+                  "dgit.default.distro");
+    }
 }
 
 sub access_quirk () {
 }
 
 sub access_quirk () {