From: Fabian Groffen Date: Mon, 24 Dec 2007 13:42:43 +0000 (-0000) Subject: fix import logic, to hopefully not break this time X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=50c54dbed4b2d3836f65b6b7380f5991746ccb96;p=portage.git fix import logic, to hopefully not break this time svn path=/main/branches/prefix/; revision=9048 --- diff --git a/bin/archive-conf b/bin/archive-conf index 9047f3abf..4caa1d564 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -13,11 +13,12 @@ import os, sys # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage import dispatch_conf diff --git a/bin/chkcontents b/bin/chkcontents index 1d9d11de7..e38bdedec 100755 --- a/bin/chkcontents +++ b/bin/chkcontents @@ -11,11 +11,12 @@ import os.path, os, sys # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage def CONTENTScheck(path): diff --git a/bin/clean_locks b/bin/clean_locks index 9d7c1986a..bae8a9759 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -6,11 +6,12 @@ import os,sys,errno # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage.locks from portage.const import EPREFIX diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 557c937fc..c08cd56c6 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -20,11 +20,12 @@ from random import * import atexit, commands, os, re, shutil, stat, sys # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage from portage import dispatch_conf, const diff --git a/bin/ebuild b/bin/ebuild index 9c4d69652..4db0f462e 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -27,11 +27,12 @@ if "merge" in pargs: os.environ["PORTAGE_CALLER"]="ebuild" # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage import portage.util, portage.const diff --git a/bin/emaint b/bin/emaint index d333f5679..38a13b87e 100755 --- a/bin/emaint +++ b/bin/emaint @@ -5,11 +5,12 @@ from optparse import OptionParser, OptionValueError import re # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage import portage.const, portage.exception, portage.output diff --git a/bin/emerge b/bin/emerge index 60cf94d83..16ca57d29 100755 --- a/bin/emerge +++ b/bin/emerge @@ -5,11 +5,12 @@ # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import _emerge if __name__ == "__main__": diff --git a/bin/env-update b/bin/env-update index 8af3b0886..53019b2fb 100755 --- a/bin/env-update +++ b/bin/env-update @@ -24,11 +24,12 @@ if len(sys.argv) > 1: usage(1) # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage try: diff --git a/bin/fix-db.py b/bin/fix-db.py index ba44a0a16..5829412eb 100755 --- a/bin/fix-db.py +++ b/bin/fix-db.py @@ -6,11 +6,12 @@ import os,sys,re # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage from stat import * diff --git a/bin/fixpackages b/bin/fixpackages index dc6e75c4d..756da6126 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -7,11 +7,12 @@ import os,sys os.environ["PORTAGE_CALLER"]="fixpackages" # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage mysettings = portage.settings diff --git a/bin/glsa-check b/bin/glsa-check index 892851f75..cdd1db304 100644 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -7,11 +7,12 @@ import os import sys # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage from portage.output import * diff --git a/bin/md5check.py b/bin/md5check.py index 57de95947..39941a253 100755 --- a/bin/md5check.py +++ b/bin/md5check.py @@ -7,11 +7,12 @@ import os,sys os.environ["FEATURES"]="mirror cvs" # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage import portage.util diff --git a/bin/pkgname b/bin/pkgname index d7482f4bf..41ae9f13d 100755 --- a/bin/pkgname +++ b/bin/pkgname @@ -6,11 +6,12 @@ import sys, os # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage a=portage.pkgsplit(sys.argv[1]) diff --git a/bin/portageq b/bin/portageq index 7c339a349..23de667b3 100755 --- a/bin/portageq +++ b/bin/portageq @@ -475,11 +475,12 @@ def main(): os.environ["PORTAGE_LEGACY_GLOBALS"] = "false" # for an explanation on this logic, see pym/_emerge/__init__.py - from os import path as osp - if os.environ.contains("PORTAGE_PYTHONPATH"): + import os + import sys + if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage del os.environ["PORTAGE_LEGACY_GLOBALS"] diff --git a/bin/quickpkg b/bin/quickpkg index 0d8e0faed..08332cc4d 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -6,11 +6,12 @@ import errno, signal, sys, os # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) def quickpkg_main(options, args, eout): from portage import catsplit, dep_expand, flatten, isvalidatom, xpak diff --git a/bin/regenworld b/bin/regenworld index 04d4e6ede..369d7faba 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -6,11 +6,12 @@ import sys, os # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage import re, portage.const diff --git a/bin/repoman b/bin/repoman index f535a3034..1106246a1 100755 --- a/bin/repoman +++ b/bin/repoman @@ -43,11 +43,12 @@ if not hasattr(__builtins__, "set"): os.environ["PORTAGE_LEGACY_GLOBALS"] = "false" # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage del os.environ["PORTAGE_LEGACY_GLOBALS"] diff --git a/bin/xpak b/bin/xpak index 2a945a84c..0a714fa8f 100755 --- a/bin/xpak +++ b/bin/xpak @@ -9,11 +9,12 @@ if len(sys.argv)!=3: sys.exit(1) # for an explanation on this logic, see pym/_emerge/__init__.py -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage.xpak portage.xpak.xpak(sys.argv[1],sys.argv[2]) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 5070b5ea6..c8c852bcb 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -35,11 +35,12 @@ os.environ["PORTAGE_LEGACY_GLOBALS"] = "false" # Portage using another Prefix instance on the same system. For this # reason we ignore the entire search path, and allow a backdoor for # developers via the PORTAGE_PYTHONPATH variable. -from os import path as osp -if os.environ.contains("PORTAGE_PYTHONPATH"): +import os +import sys +if os.environ.__contains__("PORTAGE_PYTHONPATH"): sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"]) else: - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage del os.environ["PORTAGE_LEGACY_GLOBALS"]