Merge lp:~afb/smart/rpmutil into lp:smart

[Anders F Björklund]

[lp:~afb/smart/rpmutil]

850. By Anders F Björklund on 2009-03-02

add missing DIRINDEXES <duh>

851. By Anders F Björklund on 2009-03-02

make sure it's a list

852. By Anders F Björklund on 2009-03-02

add test case for filepaths

853. By Anders F Björklund on 2009-03-02

merge changes from trunk

854. By Anders F Björklund on 2009-03-02

merge changes from trunk

855. By Anders F Björklund on 2009-03-02

fix test

=== modified file 'smart/backends/rpm/base.py'
--- smart/backends/rpm/base.py	2007-11-25 22:07:53 +0000
+++ smart/backends/rpm/base.py	2009-03-02 07:43:53 +0000
@@ -25,6 +25,7 @@
 import zlib
 
 from rpmver import checkdep, vercmp, splitarch, splitrelease
+from util import archscore
 from smart.util.strtools import isGlob
 from smart.cache import *
 from smart import *
@@ -41,8 +42,6 @@
         traceback.print_exc()
     raise Error, _("'rpm' python module is not available")
 
-archscore = rpm.archscore
-
 __all__ = ["RPMPackage", "RPMProvides", "RPMNameProvides", "RPMPreRequires",
            "RPMRequires", "RPMUpgrades", "RPMConflicts", "RPMObsoletes",
            "rpm", "getTS", "system_provides"]

=== modified file 'smart/backends/rpm/header.py'
--- smart/backends/rpm/header.py	2008-07-22 10:37:20 +0000
+++ smart/backends/rpm/header.py	2009-03-02 07:43:53 +0000
@@ -21,6 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 from smart.backends.rpm.rpmver import splitarch
+from smart.backends.rpm.util import filepaths, archscore
 from smart.util.strtools import globdistance
 from smart.cache import Loader, PackageInfo
 from smart.channel import FileChannel
@@ -120,9 +121,7 @@
 
     def getPathList(self):
         if self._path is None:
-            paths = self._h[rpm.RPMTAG_OLDFILENAMES]
-            if type(paths) != list:
-                paths = [paths]
+            paths = filepaths(self._h)
             modes = self._h[rpm.RPMTAG_FILEMODES]
             if modes:
                 if type(modes) != list:
@@ -196,7 +195,7 @@
             if h[1106]: # RPMTAG_SOURCEPACKAGE
                 continue
             arch = h[1022] # RPMTAG_ARCH
-            if rpm.archscore(arch) == 0:
+            if archscore(arch) == 0:
                 continue
 
             name = h[1000] # RPMTAG_NAME
@@ -323,10 +322,8 @@
                 searcher.addResult(pkg, ratio)
                 continue
             if searcher.path:
-                paths = h[rpm.RPMTAG_OLDFILENAMES]
+                paths = filepaths(h)
                 if paths:
-                    if type(paths) != list:
-                        paths = [paths]
                     for spath, cutoff in searcher.path:
                         for path in paths:
                             _, newratio = globdistance(spath, path, cutoff, ic)
@@ -474,9 +471,7 @@
         h, offset = rpm.readHeaderFromFD(file.fileno())
         bfp = self.buildFileProvides
         while h:
-            fnlst = h[1027] # RPMTAG_OLDFILENAMES
-            if type(fnlst) != list:
-                fnlst = [fnlst]
+            fnlst = filepaths(h)
             for fn in fnlst:
                 fn = fndict.get(fn)
                 if fn and offset in self._offsets:
@@ -487,9 +482,7 @@
     def loadFileProvidesHDL(self, fndict):
         bfp = self.buildFileProvides
         for offset, h in enumerate(self._hdl):
-            fnlst = h[1027] # RPMTAG_OLDFILENAMES
-            if type(fnlst) != list:
-                fnlst = [fnlst]
+            fnlst = filepaths(h)
             for fn in fnlst:
                 fn = fndict.get(fn)
                 if fn and offset in self._offsets:
@@ -677,9 +670,7 @@
                 iface.error("%s: %s" % (os.path.basename(filepath), e))
             else:
                 file.close()
-                fnlst = h[1027] # RPMTAG_OLDFILENAMES
-                if type(fnlst) != list:
-                    fnlst = [fnlst]
+                fnlst = filepaths(h)
                 for fn in fnlst:
                     fn = fndict.get(fn)
                     if fn:

=== modified file 'smart/backends/rpm/metadata.py'
--- smart/backends/rpm/metadata.py	2008-08-02 15:07:10 +0000
+++ smart/backends/rpm/metadata.py	2009-03-02 07:43:53 +0000
@@ -22,6 +22,7 @@
 #
 from smart.cache import PackageInfo, Loader
 from smart.backends.rpm.base import *
+from smart.backends.rpm.util import *
 
 try:
     from xml.etree import cElementTree        
@@ -172,7 +173,7 @@
                         skip = None
 
                 elif tag == ARCH:
-                    if rpm.archscore(elem.text) == 0:
+                    if archscore(elem.text) == 0:
                         skip = PACKAGE
                     else:
                         arch = elem.text

=== modified file 'smart/backends/rpm/redcarpet.py'
--- smart/backends/rpm/redcarpet.py	2006-11-07 22:22:46 +0000
+++ smart/backends/rpm/redcarpet.py	2009-03-02 07:43:53 +0000
@@ -21,6 +21,7 @@
 #
 from smart.cache import PackageInfo, Loader
 from smart.backends.rpm.base import *
+from smart.backends.rpm.util import *
 from smart import *
 import posixpath
 import locale
@@ -191,7 +192,7 @@
         self._release = data
 
     def handleArchEnd(self, name, attrs, data):
-        if rpm.archscore(data) == 0:
+        if archscore(data) == 0:
             self._skip = self.PACKAGE
         else:
             self._arch = data

=== modified file 'smart/backends/rpm/synthesis.py'
--- smart/backends/rpm/synthesis.py	2006-11-07 22:22:46 +0000
+++ smart/backends/rpm/synthesis.py	2009-03-02 07:43:53 +0000
@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 from smart.backends.rpm.rpmver import splitarch
+from smart.backends.rpm.util import archscore
 from smart.cache import PackageInfo, Loader
 from smart.backends.rpm.base import *
 from smart import *
@@ -165,7 +166,7 @@
                     version, arch = version[:dot], version[dot+1:]
                 versionarch = "@".join((version, arch))
                 
-                if rpm.archscore(arch) == 0:
+                if archscore(arch) == 0:
                     continue
 
                 name = "-".join(rpmnameparts[0:-2])

=== added file 'smart/backends/rpm/util.py'
--- smart/backends/rpm/util.py	1970-01-01 00:00:00 +0000
+++ smart/backends/rpm/util.py	2009-03-02 07:43:53 +0000
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2005 Canonical
+#
+# Written by Anders F Bjorklund <[e-mail]>
+#
+# This file is part of Smart Package Manager.
+#
+# Smart Package Manager is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# Smart Package Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Smart Package Manager; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+import rpm
+
+archscores = {}
+
+def archscore(arch):
+    if not arch in archscores:
+        try:
+            archscores[arch] = rpm.archscore(arch)
+        except AttributeError:
+            # rpm.archscore missing from RPM 4.4.7 and 5.0.0
+            # (but available from 4.4.9 and 5.0.3, and later,
+            #  using PlatformScore rather than MachineScore)
+            archscores[arch] = 1
+    return archscores[arch]
+
+def filepaths(h):
+    paths = h[rpm.RPMTAG_OLDFILENAMES]
+    if not paths:
+        dirs = h[rpm.RPMTAG_DIRNAMES]
+        base = h[rpm.RPMTAG_BASENAMES]
+        paths = []
+        for i in range(0,len(dirs)):
+           paths.append(dirs[i] + base[i])
+    elif type(paths) != list:
+        paths = [paths]
+    return paths
+
+# vim:ts=4:sw=4:et

=== modified file 'smart/backends/rpm/yast2.py'
--- smart/backends/rpm/yast2.py	2007-10-08 01:42:30 +0000
+++ smart/backends/rpm/yast2.py	2009-03-02 07:43:53 +0000
@@ -22,6 +22,7 @@
 from smart.backends.rpm.rpmver import splitarch
 from smart.cache import PackageInfo, Loader
 from smart.backends.rpm.base import *
+from smart.backends.rpm.util import *
 from smart import *
 import posixpath
 import locale
@@ -188,7 +189,7 @@
                     raise Error("Error loading YaST2 channel info. Possibly " \
                                 "corrupted file.\n%s" % self._pkginfofile)
                 
-                if rpm.archscore(arch) <= 0:
+                if archscore(arch) <= 0:
                     return
                 name = nameparts[0]
                 self.curpkgname = name