SOURCES: yum-missingok.patch - better patch

[patrys]

Author: patrys                       Date: Mon May 28 08:53:13 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- better patch

---- Files affected:
SOURCES:
   yum-missingok.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/yum-missingok.patch
diff -u SOURCES/yum-missingok.patch:1.1 SOURCES/yum-missingok.patch:1.2
--- SOURCES/yum-missingok.patch:1.1	Sat May 26 21:17:15 2007
+++ SOURCES/yum-missingok.patch	Mon May 28 10:53:07 2007
@@ -102,27 +102,33 @@
          self._files = {}
          self.sack = repo.sack
          self.repoid = repo.id
-@@ -187,9 +189,24 @@
+@@ -187,9 +189,30 @@
                          self.pkgKey)
              executeSQL(cur, query)
              for ob in cur:
 -                self.prco[prcotype].append((ob['name'], ob['flags'],
 -                                           (ob['epoch'], ob['version'], 
 -                                            ob['release'])))
-+                fl = ob['flags'].split(',')
-+                if 'MISSINGOK' in fl:
-+                    fl.remove('MISSINGOK')
-+                    flags = ','.join(fl)
-+                    if not flags:
-+                        flags = None
-+                    if prcotype == 'requires':
-+                        self.prco['suggests'].append((ob['name'], flags,
-+                                                     (ob['epoch'], ob['version'], 
-+                                                      ob['release'])))
-+                    elif prcotype == 'provides':
-+                        self.prco['enhances'].append((ob['name'], flags,
-+                                                     (ob['epoch'], ob['version'], 
-+                                                      ob['release'])))
++                fl = ob['flags']
++                if fl:
++                    fl = fl.split(',')
++                    if 'MISSINGOK' in fl:
++                        fl.remove('MISSINGOK')
++                        flags = ','.join(fl)
++                        if not flags:
++                            flags = None
++                        if prcotype == 'requires':
++                            self.prco['suggests'].append((ob['name'], flags,
++                                                         (ob['epoch'], ob['version'], 
++                                                          ob['release'])))
++                        elif prcotype == 'provides':
++                            self.prco['enhances'].append((ob['name'], flags,
++                                                         (ob['epoch'], ob['version'], 
++                                                          ob['release'])))
++                    else:
++                        self.prco[prcotype].append((ob['name'], ob['flags'],
++                                                   (ob['epoch'], ob['version'], 
++                                                    ob['release'])))
 +                else:
 +                    self.prco[prcotype].append((ob['name'], ob['flags'],
 +                                               (ob['epoch'], ob['version'], 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/yum-missingok.patch?r1=1.1&r2=1.2&f=u