Avoids unnecessary import dependency from rpmsack to the higher
level depsolve class, allowing rpmsack to be used earlier.
---
yum/depsolve.py | 7 +------
yum/rpmsack.py | 11 ++++++++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 3aaba0e..6b5c566 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -39,6 +39,7 @@ import warnings
warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
from yum import _, _rpm_ver_atleast
+from rpmsack import verflags as flags
try:
assert max(2, 4) == 4
@@ -52,12 +53,6 @@ except:
for y in args:
if x < y: x = y
return x
-flags = {"GT": rpm.RPMSENSE_GREATER,
- "GE": rpm.RPMSENSE_EQUAL | rpm.RPMSENSE_GREATER,
- "LT": rpm.RPMSENSE_LESS,
- "LE": rpm.RPMSENSE_LESS | rpm.RPMSENSE_EQUAL,
- "EQ": rpm.RPMSENSE_EQUAL,
- None: 0 }
class Depsolve(object):
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 227ed89..33fd935 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -35,7 +35,12 @@ import re
from yum.i18n import to_unicode, _
import constants
-import yum.depsolve
+verflags = {"GT": rpm.RPMSENSE_GREATER,
+ "GE": rpm.RPMSENSE_EQUAL | rpm.RPMSENSE_GREATER,
+ "LT": rpm.RPMSENSE_LESS,
+ "LE": rpm.RPMSENSE_LESS | rpm.RPMSENSE_EQUAL,
+ "EQ": rpm.RPMSENSE_EQUAL,
+ None: 0 }
class RPMInstalledPackage(YumInstalledPackage):
@@ -1428,7 +1433,7 @@ class RPMDBPackageSack(PackageSackBase):
if self.getProvides(req, flags, ver):
providers.add(rreq)
continue
- flags = yum.depsolve.flags.get(flags, flags)
+ flags = verflags.get(flags, flags)
missing = miscutils.formatRequire(req, ver, flags)
prob = RPMDBProblemDependency(pkg, "requires", missing=missing)
problems.append(prob)
@@ -1440,7 +1445,7 @@ class RPMDBPackageSack(PackageSackBase):
res = self.getProvides(req, flags, ver)
if not res:
continue
- flags = yum.depsolve.flags.get(flags, flags)
+ flags = verflags.get(flags, flags)
found = miscutils.formatRequire(req, ver, flags)
prob = RPMDBProblemDependency(pkg, "conflicts", found=found,
conflicts=res)
--
1.7.4
_______________________________________________
Yum-devel mailing list
[email protected]
http://lists.baseurl.org/mailman/listinfo/yum-devel
