From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Aug 2014 17:38:22 +0000 (+0100)
Subject: Make access_basedistro honour $idistro (i.e. make -d work properly again)
X-Git-Tag: debian/0.22~28
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=08434a9b27bc7f911ab64cac7a66756caa0cb9d6

Make access_basedistro honour $idistro (i.e. make -d work properly again)
---

diff --git a/dgit b/dgit
index f9e6d1bc..ae2684b9 100755
--- a/dgit
+++ b/dgit
@@ -505,8 +505,14 @@ sub cfg {
 }
 
 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 () {