SOURCES: smart-archscore.patch - actually commit the patch this time

[patrys]

Author: patrys                       Date: Tue Jul 31 15:10:27 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- actually commit the patch this time

---- Files affected:
SOURCES:
   smart-archscore.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/smart-archscore.patch
diff -u SOURCES/smart-archscore.patch:1.2 SOURCES/smart-archscore.patch:1.3
--- SOURCES/smart-archscore.patch:1.2	Mon Jul 30 18:27:02 2007
+++ SOURCES/smart-archscore.patch	Tue Jul 31 17:10:21 2007
@@ -9,3 +9,74 @@
                  name = nameparts[0]
                  self.curpkgname = name
                  version = nameparts[1]
+--- smart-0.51/smart/backends/rpm/base.py~	2006-11-07 21:22:46.000000000 +0100
++++ smart-0.51/smart/backends/rpm/base.py	2007-07-31 17:03:17.713984667 +0200
+@@ -41,8 +41,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"]
+@@ -190,8 +188,6 @@
+                 otherver, otherarch = splitarch(other.version)
+                 if selfver != otherver:
+                     rc = vercmp(self.version, other.version)
+-                if rc == 0:
+-                    rc = -cmp(archscore(selfarch), archscore(otherarch))
+         return rc == -1
+ 
+ class RPMProvides(Provides):         __slots__ = ()
+--- smart-0.51/smart/backends/rpm/metadata.py~	2006-11-14 20:37:00.000000000 +0100
++++ smart-0.51/smart/backends/rpm/metadata.py	2007-07-31 17:05:30.193774044 +0200
+@@ -168,10 +168,7 @@
+                         skip = None
+ 
+                 elif tag == ARCH:
+-                    if rpm.archscore(elem.text) == 0:
+-                        skip = PACKAGE
+-                    else:
+-                        arch = elem.text
++                    arch = elem.text
+ 
+                 elif tag == NAME:
+                     name = elem.text
+--- smart-0.51/smart/backends/rpm/header.py~	2006-11-07 21:22:46.000000000 +0100
++++ smart-0.51/smart/backends/rpm/header.py	2007-07-31 17:06:01.189045522 +0200
+@@ -203,8 +203,6 @@
+             if h[1106]: # RPMTAG_SOURCEPACKAGE
+                 continue
+             arch = h[1022] # RPMTAG_ARCH
+-            if rpm.archscore(arch) == 0:
+-                continue
+ 
+             name = h[1000] # RPMTAG_NAME
+             epoch = h[1003] # RPMTAG_EPOCH
+--- smart-0.51/smart/backends/rpm/redcarpet.py~	2006-11-07 21:22:46.000000000 +0100
++++ smart-0.51/smart/backends/rpm/redcarpet.py	2007-07-31 17:06:29.184774598 +0200
+@@ -191,10 +191,7 @@
+         self._release = data
+ 
+     def handleArchEnd(self, name, attrs, data):
+-        if rpm.archscore(data) == 0:
+-            self._skip = self.PACKAGE
+-        else:
+-            self._arch = data
++        self._arch = data
+ 
+     def handleSectionEnd(self, name, attrs, data):
+         self._info["group"] = data
+--- smart-0.51/smart/backends/rpm/synthesis.py~	2006-11-07 21:22:46.000000000 +0100
++++ smart-0.51/smart/backends/rpm/synthesis.py	2007-07-31 17:06:58.680274874 +0200
+@@ -164,9 +164,6 @@
+                 else:
+                     version, arch = version[:dot], version[dot+1:]
+                 versionarch = "@".join((version, arch))
+-                
+-                if rpm.archscore(arch) == 0:
+-                    continue
+ 
+                 name = "-".join(rpmnameparts[0:-2])
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/smart-archscore.patch?r1=1.2&r2=1.3&f=u