[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/history.py yum/metalink.py
James Antill
james at osuosl.org
Wed Jun 16 04:54:26 UTC 2010
yum/history.py | 2 +-
yum/metalink.py | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 10b718b3a09904789de8139dec4f1cd36a43e449
Author: James Antill <james at and.org>
Date: Tue Jun 15 19:27:00 2010 -0400
Fix history recording installs, from the txmbr cleanup
diff --git a/yum/history.py b/yum/history.py
index a676773..ca87335 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -343,7 +343,7 @@ class YumHistory:
def txmbr2state(txmbr):
state = None
if txmbr.output_state in (TS_INSTALL, TS_TRUEINSTALL):
- if hasattr(txmbr, 'reinstall'):
+ if txmbr.reinstall:
state = 'Reinstall'
elif txmbr.downgrades:
state = 'Downgrade'
commit 9a6c9f8abc1977b934bd0051013ed7a39bc18af8
Author: James Antill <james at and.org>
Date: Mon Jun 14 12:09:14 2010 -0400
Parse out the new private attribute for urls
diff --git a/yum/metalink.py b/yum/metalink.py
index 20f0ea5..aaa4f25 100755
--- a/yum/metalink.py
+++ b/yum/metalink.py
@@ -134,6 +134,8 @@ class MetaLinkURL:
self.preference = int(elem.get("preference", -1))
self.protocol = elem.get("type") # This is the "std" attribute name
self.location = elem.get("location")
+ self.private = elem.get("{%s}private" % __XML_NS_MM__, "false")
+ self.private = self.private.lower() == "true"
if self.protocol is None: # Try for the old MM protocol attribute
self.protocol = elem.get("protocol")
@@ -145,8 +147,9 @@ Preference: %d
Max-Connections: %d
Protocol: %s
Location: %s
+Private: %s
""" % (self.url, self.preference, self.max_connections,
- self.protocol, self.location)
+ self.protocol, self.location, self.private)
def __cmp__(self, other):
if other is None:
More information about the Yum-commits
mailing list