Attachment 898017 Details for Bug 1099195 – patch to apply

[patch] patch to apply

BZ-1099195-strong-requires.patch (text/plain), 5.87 KB, created by Valentina Mukhamedzhanova on 2014-05-21 14:13:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Valentina Mukhamedzhanova

Created: 2014-05-21 14:13:24 UTC

Size: 5.87 KB

patch

obsolete

>Index: yum-3.2.29/yum/config.py
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>UTF-8
>===================================================================
>--- yum-3.2.29/yum/config.py	(revision )
>+++ yum-3.2.29/yum/config.py	(revision )
>@@ -757,6 +757,8 @@
>  
>     depsolve_loop_limit = PositiveIntOption(100, names_of_0=["<forever>"])
> 
>+    recheck_installed_requires = BoolOption(False)
>+
>     _reposlist = []
> 
>     def dump(self):
>Index: yum-3.2.29/yum/depsolve.py
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>UTF-8
>===================================================================
>--- yum-3.2.29/yum/depsolve.py	(revision )
>+++ yum-3.2.29/yum/depsolve.py	(revision )
>@@ -963,9 +963,12 @@
> 
>         # if this is an update, we should check what the old
>         # requires were to make things faster
>+        #  Note that if the rpmdb is broken, this gets annoying. So we provide
>+        # a way to turn it off.
>         oldreqs = []
>+        if not self.conf.recheck_installed_requires:
>-        for oldpo in txmbr.updates:
>+            for oldpo in txmbr.updates:
>-            oldreqs.extend(oldpo.returnPrco('requires'))
>+                oldreqs.extend(oldpo.returnPrco('strong_requires'))
>         oldreqs = set(oldreqs)
> 
>         ret = []
>Index: yum-3.2.29/yum/packages.py
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>UTF-8
>===================================================================
>--- yum-3.2.29/yum/packages.py	(revision )
>+++ yum-3.2.29/yum/packages.py	(revision )
>@@ -1299,6 +1299,12 @@
>                 continue
> 
>             lst = hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
>+            if tag == 'REQUIRE':
>+                #  Rpm is a bit magic here, and if pkgA requires(pre/post): foo
>+                # it will then let you remove foo _after_ pkgA has been
>+                # installed. So we need to mark those deps. as "weak".
>+                bits = rpm.RPMSENSE_SCRIPT_PRE | rpm.RPMSENSE_SCRIPT_POST
>+                weakreqs = [bool(flag & bits) for flag in lst]
>             flag = map(rpmUtils.miscutils.flagToString, lst)
>             flag = map(misc.share_data, flag)
> 
>@@ -1309,6 +1315,10 @@
> 
>             prcotype = tag2prco[tag]
>             self.prco[prcotype] = map(misc.share_data, zip(name,flag,vers))
>+            if tag == 'REQUIRE':
>+                weakreqs = zip(weakreqs, self.prco[prcotype])
>+                strongreqs = [wreq[1] for wreq in weakreqs if not wreq[0]]
>+                self.prco['strong_requires'] = strongreqs
>     
>     def tagByName(self, tag):
>         warnings.warn("tagByName() will go away in a furture version of Yum.\n",
>Index: yum-3.2.29/test/testbase.py
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>UTF-8
>===================================================================
>--- yum-3.2.29/test/testbase.py	(revision )
>+++ yum-3.2.29/test/testbase.py	(revision )
>@@ -56,6 +56,7 @@
>         self.protected_multilib = False
>         self.clean_requirements_on_remove = True
>         self.depsolve_loop_limit = 10
>+        self.recheck_installed_requires = False
> 
> class FakeSack:
>     """ Fake PackageSack to use with FakeRepository"""
>Index: yum-3.2.29/yum/rpmsack.py
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>UTF-8
>===================================================================
>--- yum-3.2.29/yum/rpmsack.py	(revision )
>+++ yum-3.2.29/yum/rpmsack.py	(revision )
>@@ -98,7 +98,7 @@
> 
>     def required_packages(self):
>         pkgset = set()
>-        for (reqn, reqf, reqevr) in self.requires:
>+        for (reqn, reqf, reqevr) in self.strong_requires:
>             for pkg in self.rpmdb.getProvides(reqn, reqf, reqevr):
>                 if pkg != self:
>                     pkgset.add(pkg)
>@@ -1495,7 +1495,7 @@
>         providers = set() # Speedup, as usual :)
>         problems = []
>         for pkg in sorted(pkgs): # The sort here is mainly for "UI"
>-            for rreq in pkg.requires:
>+            for rreq in pkg.strong_requires:
>                 if rreq[0].startswith('rpmlib'): continue
>                 if rreq in providers:            continue
> 
>Index: yum-3.2.29/yum/packages.py
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>UTF-8
>===================================================================
>--- yum-3.2.29/yum/packages.py	(revision )
>+++ yum-3.2.29/yum/packages.py	(revision )
>@@ -568,15 +568,18 @@
>     dirlist = property(fget=lambda self: self.returnFileEntries(ftype='dir'))
>     ghostlist = property(fget=lambda self: self.returnFileEntries(ftype='ghost'))
>     requires = property(fget=lambda self: self.returnPrco('requires'))
>+    strong_requires = property(fget=lambda self: self.returnPrco('strong_requires'))
>     provides = property(fget=lambda self: self.returnPrco('provides'))
>     obsoletes = property(fget=lambda self: self.returnPrco('obsoletes'))
>     conflicts = property(fget=lambda self: self.returnPrco('conflicts'))
>     provides_names = property(fget=lambda self: self.returnPrcoNames('provides'))
>     requires_names = property(fget=lambda self: self.returnPrcoNames('requires'))
>+    strong_requires_names = property(fget=lambda self: self.returnPrcoNames('strong_requires'))
>     conflicts_names = property(fget=lambda self: self.returnPrcoNames('conflicts'))
>     obsoletes_names = property(fget=lambda self: self.returnPrcoNames('obsoletes'))
>     provides_print = property(fget=lambda self: self.returnPrco('provides', True))
>     requires_print = property(fget=lambda self: self.returnPrco('requires', True))
>+    strong_requires_print = property(fget=lambda self: self.returnPrco('strong_requires', True))
>     conflicts_print = property(fget=lambda self: self.returnPrco('conflicts', True))
>     obsoletes_print = property(fget=lambda self: self.returnPrco('obsoletes', True))
>     changelog = property(fget=lambda self: self.returnChangelog())

Actions: View | Diff

Attachments on bug 1099195: 898017