[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-127-gd1ef233

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit a78d1aacfbb46001f9671a4bc2c3cca0cff27fdb
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 3 12:57:16 2013 +0100

    lib/conf: use get_distros()
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/piupartslib/conf.py b/piupartslib/conf.py
index 794bae0..9e778c0 100644
--- a/piupartslib/conf.py
+++ b/piupartslib/conf.py
@@ -65,20 +65,18 @@ class Config(UserDict.UserDict):
         return []
 
     def get_distro(self):
-        if self["distro"] is not None:
+        if self["distro"]:
             return self["distro"]
-        if self["upgrade-test-distros"] is not None:
-            distros = self["upgrade-test-distros"].split()
-            if distros:
-                return distros[-1]
+        distros = self.get_distros()
+        if distros:
+            return distros[-1]
         return None
 
     def get_final_distro(self):
-        if self["upgrade-test-distros"] is not None:
-            distros = self["upgrade-test-distros"].split()
-            if distros:
-                return distros[-1]
-        return self.get_distro()
+        distros = self.get_distros()
+        if distros:
+            return distros[-1]
+        return self["distro"]
 
     def get_area(self):
         if self["area"] is not None:

-- 
piuparts git repository