only add /usr/lib/portage/pym to python search path when necessary

svn path=/; revision=407

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 26f013108f39d7c8ff105be8e47d9ccbb60533cb..03642855fce74471d977599f0d86663d2eb2ba92 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -4,6 +4,8 @@
        within the same SLOT instead of the one with the smallest delta.
        * glsa-check: prefer visible upgrades to masked upgrades
        * equery: check for and warn about unknown options (bug 119674)
+       * equery,eclean,glsa-check,epkginfo: Only add /usr/lib/portage/pym 
+       to python search path when necessary
 
 2007-05-21: Paul Varner <fuzzyray@gentoo.org>
        * echangelog: Add patch from genstef to fix issues from Bug 176337

diff --git a/trunk/src/eclean/eclean b/trunk/src/eclean/eclean
index 1c9f8481ffd9cbfaf8687b1586a683051f7bab94..27969b1700b58da56762107d69b27914651d4dad 100644 (file)
--- a/trunk/src/eclean/eclean
+++ b/trunk/src/eclean/eclean
@@ -22,8 +22,11 @@ import time
 import getopt
 import fpformat
 import signal
-sys.path.insert(0,'/usr/lib/portage/pym')
-import portage
+try:
+       import portage
+except ImportError:
+       sys.path.insert(0, "/usr/lib/portage/pym")
+       import portage
 try:
        from portage.output import *
 except ImportError:

diff --git a/trunk/src/epkginfo/epkginfo b/trunk/src/epkginfo/epkginfo
index 7d4447f7ff99dd2ec3409319da42b3e2237575ad..ba28ad308f6938c1cdec7c7bf07d14aadeb32197 100755 (executable)
--- a/trunk/src/epkginfo/epkginfo
+++ b/trunk/src/epkginfo/epkginfo
@@ -11,15 +11,20 @@
 
 import os
 import sys
-import portage
+try:
+       import portage
+except ImportError:
+       sys.path.insert(0, "/usr/lib/portage/pym")
+       import portage
 import re
 from stat import *
-from output import *
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
 from xml.sax import saxutils, make_parser, handler
 from xml.sax.handler import feature_namespaces
 
-#sys.path.insert(0, "/usr/lib/portage/pym")
-
 version="0.4.1"
 
 def getvar(pkg, var):

diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index 3e65a605b5b58faec7ddbcb74f10c2cbeb5a4ebc..cd699d04a85626afaa163297c4b7fe1779b68b03 100755 (executable)
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -23,7 +23,11 @@ sys.path.insert(0, "/usr/lib/portage/pym")
 sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 
 import gentoolkit
-import portage
+try:
+       import portage
+except ImportError:
+       sys.path.insert(0, "/usr/lib/portage/pym")
+       import portage
 import portage_checksum
 from portage_util import unique_array
 

diff --git a/trunk/src/gentoolkit/__init__.py b/trunk/src/gentoolkit/__init__.py
index 54ff41b5e7d4f55c0f4fe97ff909eee87447af64..ecbea69000d3a9c10257a1cc990b6a755ff5e37c 100644 (file)
--- a/trunk/src/gentoolkit/__init__.py
+++ b/trunk/src/gentoolkit/__init__.py
@@ -19,8 +19,11 @@ __description__ = "Gentoolkit Common Library"
 
 import os
 import sys
-sys.path.insert(0, "/usr/lib/portage/pym")
-import portage
+try:
+       import portage
+except ImportError:
+       sys.path.insert(0, "/usr/lib/portage/pym")
+       import portage
 import re
 from threading import Lock
 

diff --git a/trunk/src/glsa-check/glsa-check b/trunk/src/glsa-check/glsa-check
index c7aec45c689661aaaa85e0452f1d9237d100e22c..71e7b065d39c54944b869c2ec45cd5caf3b716d3 100644 (file)
--- a/trunk/src/glsa-check/glsa-check
+++ b/trunk/src/glsa-check/glsa-check
@@ -6,7 +6,11 @@
 import os
 import sys
 sys.path.insert(0, "/usr/lib/gentoolkit/pym")
-sys.path.insert(0, "/usr/lib/portage/pym")
+try:
+       import portage
+except ImportError:
+       sys.path.insert(0, "/usr/lib/portage/pym")
+       import portage
 
 try:
        from portage.output import *

diff --git a/trunk/src/glsa-check/glsa.py b/trunk/src/glsa-check/glsa.py
index 32cde7e6df740bcf1f5454186818b4ef2deb67bc..60588d02d2ba2e30cf7cd127112270d7d1c923d1 100644 (file)
--- a/trunk/src/glsa-check/glsa.py
+++ b/trunk/src/glsa-check/glsa.py
@@ -25,9 +25,11 @@ if sys.version_info[0:2] < (2,3):
        raise NotImplementedError("Python versions below 2.3 have broken XML code " \
                                                                +"and are not supported")
 
-sys.path.insert(0, "/usr/lib/portage/pym")     # to find portage.py
-
-import portage
+try:
+       import portage
+except ImportError:
+       sys.path.insert(0, "/usr/lib/portage/pym")
+       import portage
 
 # Note: the space for rgt and rlt is important !!
 opMapping = {"le": "<=", "lt": "<", "eq": "=", "gt": ">", "ge": ">=",