diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-08-03 18:38:22 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-08-03 18:38:22 +0100 |
commit | 08434a9b27bc7f911ab64cac7a66756caa0cb9d6 (patch) | |
tree | 2a958d9d84f90b5b3478591c8b022ebc24f5d750 | |
parent | 282db732c877da890e55e5664e43636f8a9647ad (diff) |
Make access_basedistro honour $idistro (i.e. make -d work properly again)
-rwxr-xr-x | dgit | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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 () { |