From: Chris Lamb <lamby@debian.org>
Date: Fri, 30 Oct 2009 23:43:51 +0000 (+0000)
Subject: Simplify which_conf_file.s
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f4584fffe563c0d947c4fc7b30981eeef463efd6;p=dak.git

Simplify which_conf_file.s
---

diff --git a/daklib/config.py b/daklib/config.py
index 2f24cd3a..bc16f95a 100755
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -39,10 +39,7 @@ from singleton import Singleton
 default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties
 
 def which_conf_file():
-    if os.getenv("DAK_CONFIG"):
-        return os.getenv("DAK_CONFIG")
-    else:
-        return default_config
+    return os.getenv("DAK_CONFIG", default_config)
 
 class Config(Singleton):
     """