[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053
Andreas Beckmann
debian at abeckmann.de
Fri Dec 23 10:26:59 UTC 2011
The following commit has been merged in the master branch:
commit a5295d256b46cf329b7abd6352ffd3613ea8ea47
Author: Andreas Beckmann <debian at abeckmann.de>
Date: Sun Nov 6 17:43:58 2011 +0100
simplify get_diversions()
fix a typo and replace an overly complicated code fragment
Signed-off-by: Andreas Beckmann <debian at abeckmann.de>
diff --git a/piuparts.py b/piuparts.py
index 7a9a202..ae7272a 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1011,18 +1011,14 @@ class Chroot:
return vdict
def get_diversions(self):
- """Get current dpkg-divert --list in a chroot."""
+ """Get current dpkg-divert --list in a chroot."""
if not settings.check_broken_diversions:
return
(status, output) = self.run(["dpkg-divert", "--list"])
- lines = []
- for line in output.split("\n"):
- lines.append(line)
- return lines
-
+ return output.split("\n")
def check_for_broken_diversions(self):
- """Check that diversions in chroot are identical (though potenttially reordered)."""
+ """Check that diversions in chroot are identical (though potentially reordered)."""
if not settings.check_broken_diversions:
return
if self.pre_install_diversions and self.post_install_diversions:
--
piuparts git repository
More information about the Piuparts-commits
mailing list