For bug #167217, don't hardcode /usr/lib/portage. (trunk r5945)

svn path=/main/branches/2.1.2/; revision=6016

diff --git a/bin/archive-conf b/bin/archive-conf
index bec5b3f0f0e01ffef2bdf82472140506bbd746a6..2fcecc6468129b421b03b0a45f86747fe21f17f0 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -14,7 +14,8 @@ import os, sys
 try:
     import portage
 except ImportError:
-    sys.path.insert(0, "/usr/lib/portage/pym")
+    from os import path as osp
+    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
     import portage
 
 import dispatch_conf

diff --git a/bin/chkcontents b/bin/chkcontents
index 8be51782dc6c4f0539a8a7ad75c87a0233374c9e..fe108de06cdbf6418c3347cc781f1db4b7dccfc3 100755 (executable)
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -12,7 +12,8 @@ import os.path, os, sys
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
 def CONTENTScheck(path):

diff --git a/bin/clean_locks b/bin/clean_locks
index 71db0b8e216addcc58f4dbbbdd9de627c218003d..57076b6318a616dd87a96a36d4576d29b2037383 100755 (executable)
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -7,7 +7,8 @@ import os,sys,errno
 try:
        import portage_locks
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage_locks
 
 if not sys.argv[1:] or "--help" in sys.argv or "-h" in sys.argv:

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index c8e4d567857caf223eb5f3ce554b1ee3f27e8ada..348274802544d263896066b3fdb8d88520919027 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -21,7 +21,8 @@ import atexit, commands, os, re, shutil, stat, sys
 try:
     import portage
 except ImportError:
-    sys.path.insert(0, "/usr/lib/portage/pym")
+    from os import path as osp
+    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
     import portage
 
 import dispatch_conf

diff --git a/bin/ebuild b/bin/ebuild
index 33bc06c983d3407db3a542d77ecfe3b01643dcee..bb38911f75431a4e31aab9fe880777bbf320bb7a 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -24,7 +24,8 @@ os.environ["PORTAGE_CALLER"]="ebuild"
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
 import portage_util, portage_const

diff --git a/bin/emaint b/bin/emaint
index 187ff773affbd232f73d0cf161e1b1cf3a536d80..e86920a2f2c7d7b48a01bde1cae95e9f7ac29c84 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -8,7 +8,8 @@ import re
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
 import portage_const, portage_exception

diff --git a/bin/emerge b/bin/emerge
index 20eb7265f240a4eafa7e7a161d34b447115ae7bd..ae5bafb5e9b5e91c79f032782479957013a7c196 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -26,7 +26,8 @@ os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 del os.environ["PORTAGE_LEGACY_GLOBALS"]
 from portage import digraph

diff --git a/bin/env-update b/bin/env-update
index 69daaca878643cfbb8c2e48805e0dc55dbfd8f3f..29487680850c30d818437852cf593bd712c64a7a 100755 (executable)
--- a/bin/env-update
+++ b/bin/env-update
@@ -26,7 +26,8 @@ if len(sys.argv) > 1:
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 try:
        portage.env_update(makelinks)

diff --git a/bin/fix-db.py b/bin/fix-db.py
index e8bbad2caff2803d82bfe5dab3ea6e2e2feba3f6..8292bc9608e2c28288378ee9ae43b100939ff794 100755 (executable)
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -8,7 +8,8 @@ import os,sys,re
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
 from stat import *

diff --git a/bin/fixpackages b/bin/fixpackages
index c03207d0af4da186f2968c437be17c2177600c31..388a9ad44ce3bf70df9f8c143fe9646b48691d1c 100755 (executable)
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -8,7 +8,8 @@ os.environ["PORTAGE_CALLER"]="fixpackages"
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
 mysettings = portage.settings

diff --git a/bin/md5check.py b/bin/md5check.py
index 359a0bf004205ecbf2c6de2e15db0577fbad1239..8f1159e75f206a15a4ff768a2e3b873e8f59e441 100755 (executable)
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -8,7 +8,8 @@ os.environ["FEATURES"]="mirror cvs"
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 import portage_util
 

diff --git a/bin/pkgname b/bin/pkgname
index ee4807744c0ddaf0e1d4718851dfa495cb7bbaf2..4c0dd6c949e7c5e4b318bb1e2400af54de513a45 100755 (executable)
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -7,7 +7,8 @@ import sys, os
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 
 a=portage.pkgsplit(sys.argv[1])

diff --git a/bin/portageq b/bin/portageq
index aa302555df231ac831eb10bfa6022abf946cd0af..de2a24c12864847bd31f302763cfa0958e0a6646 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -270,24 +270,6 @@ def envvar(argv):
                else:
                        print portage.settings[arg]
 
-def get_repos(argv):
-       """<root>
-       Returns all repos with names (repo_name file) argv[0] = $ROOT
-       """
-       if len(argv) < 1:
-               print "ERROR: insufficient parameters!"
-               sys.exit(2)
-       print " ".join(portage.db[argv[0]]["porttree"].dbapi.getRepositories())
-
-def get_repo_path(argv):
-       """<root> <repo_id>+
-       Returns the path to the repo named argv[1], argv[0] = $ROOT
-       """
-       if len(argv) < 2:
-               print "ERROR: insufficient parameters!"
-               sys.exit(2)
-       for arg in arvg[1:]
-               print portage.db[argv[0]]["porttree"].dbapi.getRepositoryPath(argv[1])
 
 #-----------------------------------------------------------------------------
 #
@@ -308,7 +290,7 @@ def usage(argv):
        #
        for name in globals().keys():
                # Drop python stuff, modules, and our own support functions.
-               if (name in ("usage", "__doc__", "__name__", "main", "os", "portage", "sys", "__builtins__", "types", "string","exithandler")):
+               if (name in ("usage", "__doc__", "__name__", "main", "os", "portage", "sys", "__builtins__", "types", "string")):
                        continue
 
                # Drop non-functions
@@ -351,7 +333,8 @@ def main():
                try:
                        import portage
                except ImportError:
-                       sys.path.insert(0, "/usr/lib/portage/pym")
+                       from os import path as osp
+                       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
                        import portage
                if uses_root:
                        sys.argv[2] = portage.root

diff --git a/bin/regenworld b/bin/regenworld
index 0f7de9a2a330b1ce84a93e0634d784a4c89a81bf..ebac4a5916f1e29f919dc15917a0fef5c64b8376 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -7,7 +7,8 @@ import sys, os
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 import re
 

diff --git a/bin/repoman b/bin/repoman
index daa19afdbd193767968820dd542e2a423cd0576b..fa4bbcabd6ca67b805556cd52da2d4f4d753f2dc 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -26,7 +26,8 @@ os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
 try:
        import portage
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 del os.environ["PORTAGE_LEGACY_GLOBALS"]
 

diff --git a/bin/xpak b/bin/xpak
index 8dcbf145c2edc7939e48566ebf84ce0caedde549..4fc1eb9fb8a542ac4013ac64bd1e4a16641e805c 100755 (executable)
--- a/bin/xpak
+++ b/bin/xpak
@@ -11,7 +11,8 @@ if len(sys.argv)!=3:
 try:
        import xpak
 except ImportError:
-       sys.path.insert(0, "/usr/lib/portage/pym")
+       from os import path as osp
+       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import xpak
 
 xpak.xpak(sys.argv[1],sys.argv[2])