[jhbuild/external-deps: 7/19] No dep on apt_pkg :)



commit f47e9c465f86dc74489a473405c46eb7efddb6da
Author: John Carr <john carr unrouted co uk>
Date:   Thu May 28 16:30:01 2009 +0100

    No dep on apt_pkg :)
---
 jhbuild/utils/systempackages.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jhbuild/utils/systempackages.py b/jhbuild/utils/systempackages.py
index 2047155..f9608c2 100644
--- a/jhbuild/utils/systempackages.py
+++ b/jhbuild/utils/systempackages.py
@@ -64,7 +64,7 @@ class DebianPackages(SystemPackages):
         pkg = self.apt_cache[name]
         if not pkg.isInstalled:
             return False
-        if version and apt_pkg.VersionCompare(version, pkg.installed.version) > 0:
+        if version and apt.VersionCompare(version, pkg.installed.version) > 0:
             return False
         return True
 
@@ -73,12 +73,11 @@ class DebianPackages(SystemPackages):
             return False
         if version:
             pkg = self.apt_cache[name]
-            if apt.candidate and apt_pkg.VersionCompare(version, apt.candidate.version) > 0:
+            if apt.candidate and apt.VersionCompare(version, apt.candidate.version) > 0:
                 return False
         return True
 
     def install(self, names):
-        import apt
         fetchprogress = apt.progress.TextFetchProgress()
         installprogress = apt.progress.InstallProgress()
         cache = apt.Cache()
@@ -93,7 +92,7 @@ class DebianPackages(SystemPackages):
 
     def supported(cls):
         try:
-            import apt, apt_pkg
+            import apt
             return True
         except ImportError:
             return False



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]