Change package.get_???_deps() methods to try the portage tree first, since emerge...

svn path=/; revision=368

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 1a36199ac7ad516c464f85563c7649143c001c55..80e6d753113dc464968bf258819e8f7ca46c043a 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29: Paul Varner <fuzzyray@gentoo.org>
+       * gentoolkit: Change package.get_???_deps() methods to try the portage
+       tree first, since emerge always uses the portage tree for dependencies.
+       (Bug #164678)
+
 2007-03-29: Paul Varner <fuzzyray@gentoo.org>
        * equery: Convert deprecated strings functions to str methods (Bug
        #172694)

diff --git a/trunk/src/gentoolkit/package.py b/trunk/src/gentoolkit/package.py
index 71ebb11395062aec6e30e8a6c47c30194ebd0232..480467bb26f8a04f2695b6629e07d4296fcd79aa 100644 (file)
--- a/trunk/src/gentoolkit/package.py
+++ b/trunk/src/gentoolkit/package.py
@@ -72,24 +72,33 @@ class Package:
        def get_runtime_deps(self):
                """Returns a linearised list of first-level run time dependencies for this package, on
                the form [(comparator, [use flags], cpv), ...]"""
-               # Always use the portage tree, since emerge only uses the tree when calculating dependencies
-               cd = self.get_env_var("RDEPEND").split()
+               # Try to use the portage tree first, since emerge only uses the tree when calculating dependencies
+               try:
+                       cd = self.get_env_var("RDEPEND", porttree).split()
+               except KeyError:
+                       cd = self.get_env_var("RDEPEND", vartree).split()
                r,i = self._parse_deps(cd)
                return r
 
        def get_compiletime_deps(self):
                """Returns a linearised list of first-level compile time dependencies for this package, on
                the form [(comparator, [use flags], cpv), ...]"""
-               # Always use the portage tree, since emerge only uses the tree when calculating dependencies
-               rd = self.get_env_var("DEPEND").split()
+               # Try to use the portage tree first, since emerge only uses the tree when calculating dependencies
+               try:
+                       rd = self.get_env_var("DEPEND", porttree).split()
+               except KeyError:
+                       rd = self.get_env_var("DEPEND", vartree).split()
                r,i = self._parse_deps(rd)
                return r
 
        def get_postmerge_deps(self):
                """Returns a linearised list of first-level post merge dependencies for this package, on
                the form [(comparator, [use flags], cpv), ...]"""
-               # Always use the portage tree, since emerge only uses the tree when calculating dependencies
-               pd = self.get_env_var("PDEPEND").split()
+               # Try to use the portage tree first, since emerge only uses the tree when calculating dependencies
+               try:
+                       pd = self.get_env_var("PDEPEND", porttree).split()
+               except KeyError:
+                       pd = self.get_env_var("PDEPEND", vartree).split()
                r,i = self._parse_deps(pd)
                return r