[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.48-19-g93bfc2b
Andreas Beckmann
debian at abeckmann.de
Sat Dec 1 10:50:54 UTC 2012
The following commit has been merged in the develop branch:
commit c2bb264d149943e05932867c672f1e53c61e3d07
Author: Andreas Beckmann <debian at abeckmann.de>
Date: Sun Nov 4 13:42:38 2012 +0100
lib/conf: add get_final_distro() method
Signed-off-by: Andreas Beckmann <debian at abeckmann.de>
diff --git a/debian/changelog b/debian/changelog
index fc1beb4..c030fd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ piuparts (0.49) UNRELEASED; urgency=low
- Do not try to install unavailable packages (pseudo-version None) after
dist-upgrade.
* piuparts.conf:
+ * piupartslib/conf.py:
+ - Add get_final_distro() method.
* piuparts-master.py:
* piuparts-slave.py:
- Disable X forwarding while connecting to master.
diff --git a/piupartslib/conf.py b/piupartslib/conf.py
index 70a879a..c705ad6 100644
--- a/piupartslib/conf.py
+++ b/piupartslib/conf.py
@@ -68,6 +68,13 @@ class Config(UserDict.UserDict):
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()
+
def get_area(self):
if self["area"] is not None:
return self["area"]
--
piuparts git repository
More information about the Piuparts-commits
mailing list