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

[Seth Vidal]

 yum/packages.py |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 7e8385378458370b8254cc2f4f97a720531a4411
Merge: 94208a5... 06389b3...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Mar 24 22:50:40 2008 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Add some missing options

commit 94208a5dcd609b7e908d53bbb23a427662e09ddf
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Mar 24 22:47:25 2008 -0400

    make sure we return the right stuff for src rpm's - arch == src not
    whatever rpm has shoved in there.

diff --git a/yum/packages.py b/yum/packages.py
index b7d507b..7ffa184 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1174,6 +1174,14 @@ class YumLocalPackage(YumHeaderPackage):
         self._stat = os.stat(self.localpath)
         self.filetime = str(self._stat[-1])
         self.packagesize = str(self._stat[6])
+        self.arch = self.isSrpm()
+        self.pkgtup = (self.name, self.arch, self.epoch, self.ver, self.rel)
+        
+    def isSrpm(self):
+        if self.tagByName('sourcepackage') == 1 or not self.tagByName('sourcerpm'):
+            return 'src'
+        else:
+            return self.tagByName('arch')
         
     def localPkg(self):
         return self.localpath