[yum-git] 2 commits - yum/packages.py yum/sqlitesack.py

[Tim Lauridsen]

 yum/packages.py   |    7 +++++--
 yum/sqlitesack.py |    4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 84764261e3034e087de8ebd53ca0aba16ad952ff
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Mon Feb 4 09:23:16 2008 +0100

    Added a hash to make the object unigue

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index ca52b48..474f642 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -70,7 +70,8 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
     files = property(fget=lambda self: self._loadFiles())
 
     def __repr__(self):
-        return "<Available Package : %s (%s) >" % (str(self),self.repo.id)
+        h = hex(hash(self.pkgid + self.repo.id + str(self)))
+        return "<Available Package : %s (%s) %s >" % (str(self),self.repo.id,h)
         
     def _read_db_obj(self, db_obj, item=None):
         """read the db obj. If asked for a specific item, return it.
commit f9d6713de51965bd5997a32fcb1a60c10f930f75
Author: Tim Lauridsen <tim at naboo.local>
Date:   Sun Feb 3 14:11:23 2008 +0100

    * make package object show some useful info when printed.
    * make print str(po) look the same for installed and available packages.

diff --git a/yum/packages.py b/yum/packages.py
index 3c8e712..a665eb6 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -706,10 +706,10 @@ class YumHeaderPackage(YumAvailablePackage):
         
     def __str__(self):
         if self.epoch == '0':
-            val = '%s - %s-%s.%s' % (self.name, self.version, self.release, 
+            val = '%s-%s-%s.%s' % (self.name, self.version, self.release,
                                         self.arch)
         else:
-            val = '%s - %s:%s-%s.%s' % (self.name, self.epoch, self.version,
+            val = '%s:%s-%s-%s.%s' % (self.epoch,self.name, self.version,
                                            self.release, self.arch)
         return val
 
@@ -822,6 +822,9 @@ class YumInstalledPackage(YumHeaderPackage):
         fakerepo = _installed_repo
         YumHeaderPackage.__init__(self, fakerepo, hdr)
 
+    def __repr__(self):
+        return "<Installed Package : %s >" % (str(self))
+
     def verify(self, patterns=[]):
         """verify that the installed files match the packaged checksum
            optionally verify they match only if they are in the 'pattern' list
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 0c53da9..ca52b48 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -68,6 +68,9 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
         self._hash = None
 
     files = property(fget=lambda self: self._loadFiles())
+
+    def __repr__(self):
+        return "<Available Package : %s (%s) >" % (str(self),self.repo.id)
         
     def _read_db_obj(self, db_obj, item=None):
         """read the db obj. If asked for a specific item, return it.