Accepting request 51632 from Base:System

Accepted submit request 51632 from user lnussel

OBS-URL: https://build.opensuse.org/request/show/51632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=74

BrandingPolicyCheck.py

@@ -35,7 +35,8 @@ class BrandingPolicyCheck(AbstractCheck.AbstractCheck):
                     (r[0].find('-theme-') >= 0 or r[0].find('-branding-') >= 0)):
                 printError(pkg,'suse-branding-specific-branding-req', r[0])
             if r[0].endswith('branding') or r[0].endswith('theme'):
-                if (r[1] != rpm.RPMSENSE_EQUAL or not r[2].startswith('1')):
+                # XXX: that startswith 1 breaks with openSUSE 20...
+                if (r[1] != rpm.RPMSENSE_EQUAL or not r[2][1].startswith('1')):
                     printError(pkg,'suse-branding-unversioned-requires', r[0])
 
         # verify that it doesn't conflict with branding

add-weak-dependencies.diff

@@ -1,6 +1,8 @@
---- Pkg.py
+Index: Pkg.py
+===================================================================
+--- Pkg.py.orig
 +++ Pkg.py
-@@ -425,6 +425,10 @@
+@@ -425,6 +425,10 @@ class Pkg:
          self._missingok_files = None
          self._files = None
          self._requires = None
@@ -11,7 +13,7 @@
          self._req_names = -1
  
          if header:
-@@ -656,6 +660,22 @@
+@@ -656,6 +660,22 @@ class Pkg:
          self._gatherDepInfo()
          return self._requires
  
@@ -34,7 +36,7 @@
      def prereq(self):
          """Get package PreReqs as list of
             (name, flags, (epoch, version, release)) tuples."""
-@@ -692,18 +712,25 @@
+@@ -692,7 +712,7 @@ class Pkg:
  
      # internal function to gather dependency info used by the above ones
      def _gather_aux(self, header, list, nametag, flagstag, versiontag,
@@ -43,13 +45,7 @@
          names = header[nametag]
          flags = header[flagstag]
          versions = header[versiontag]
- 
-+        print "versions", versions
-+
-         if versions:
-             for loop in range(len(versions)):
-+                print "looping over", versions[loop], type(versions[loop])
-                 evr = stringToVersion(versions[loop])
+@@ -703,7 +723,11 @@ class Pkg:
                  if prereq is not None and flags[loop] & PREREQ_FLAG:
                      prereq.append((names[loop], flags[loop] & (~PREREQ_FLAG),
                                     evr))
@@ -62,7 +58,7 @@
                      list.append((names[loop], flags[loop], evr))
  
      def _gatherDepInfo(self):
-@@ -713,6 +740,10 @@
+@@ -713,6 +737,10 @@ class Pkg:
              self._provides = []
              self._conflicts = []
              self._obsoletes = []
@@ -73,7 +69,7 @@
  
              self._gather_aux(self.header, self._requires,
                               rpm.RPMTAG_REQUIRENAME,
-@@ -732,6 +763,32 @@
+@@ -732,6 +760,32 @@ class Pkg:
                               rpm.RPMTAG_OBSOLETEFLAGS,
                               rpm.RPMTAG_OBSOLETEVERSION)
  

rpmlint.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 29 07:23:39 UTC 2010 - lnussel@suse.de
+
+- remove debug logging
+- fix BrandingPolicy.py
+
 -------------------------------------------------------------------
 Wed Oct 27 14:18:14 CEST 2010 - dmueller@suse.de