diff options
| author | genone <genone@gentoo.org> | 2007-05-30 23:05:16 +0000 |
|---|---|---|
| committer | genone <genone@gentoo.org> | 2007-05-30 23:05:16 +0000 |
| commit | f81e127cb34373e583f68a927ef3f709ec02b0e9 (patch) | |
| tree | 34a3c30c285a0cd23a2ee05a22cc387bc5600d89 /trunk/src/glsa-check | |
| parent | 92bfd6d5abe8d35f5b79acdb40a4139f827a260a (diff) | |
| download | gentoolkit-f81e127cb34373e583f68a927ef3f709ec02b0e9.tar.gz | |
only add /usr/lib/portage/pym to python search path when necessary
svn path=/; revision=407
Diffstat (limited to 'trunk/src/glsa-check')
| -rw-r--r-- | trunk/src/glsa-check/glsa-check | 6 | ||||
| -rw-r--r-- | trunk/src/glsa-check/glsa.py | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/trunk/src/glsa-check/glsa-check b/trunk/src/glsa-check/glsa-check index c7aec45..71e7b06 100644 --- 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 32cde7e..60588d0 100644 --- 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": ">=", |