summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-10 21:43:35 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-10 21:43:35 +0000
commitb6d91984f5c298e172bd4e71d82919000971521f (patch)
tree02d5f51e82399dd54dc86be8041559ce075f4871 /bin
parentfix broken imports (diff)
downloadportage-multirepo-b6d91984f5c298e172bd4e71d82919000971521f.tar.gz
portage-multirepo-b6d91984f5c298e172bd4e71d82919000971521f.tar.bz2
portage-multirepo-b6d91984f5c298e172bd4e71d82919000971521f.zip
Use os.path.realpath to handle symlinks properly.
svn path=/main/trunk/; revision=5945
Diffstat (limited to 'bin')
-rwxr-xr-xbin/archive-conf2
-rwxr-xr-xbin/chkcontents2
-rwxr-xr-xbin/clean_locks2
-rwxr-xr-xbin/dispatch-conf2
-rwxr-xr-xbin/ebuild2
-rwxr-xr-xbin/emaint2
-rwxr-xr-xbin/emerge2
-rwxr-xr-xbin/env-update2
-rwxr-xr-xbin/fix-db.py2
-rwxr-xr-xbin/fixpackages2
-rwxr-xr-xbin/md5check.py2
-rwxr-xr-xbin/pkgname2
-rwxr-xr-xbin/portageq2
-rwxr-xr-xbin/regenworld2
-rwxr-xr-xbin/repoman2
-rwxr-xr-xbin/xpak2
16 files changed, 16 insertions, 16 deletions
diff --git a/bin/archive-conf b/bin/archive-conf
index f43d993a..63ce9b2e 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -15,7 +15,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 3d1ab2ca..fe108de0 100755
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -13,7 +13,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 cddb5261..89473bd8 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -8,7 +8,7 @@ try:
import portage.locks
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 870f8225..6c5b57e6 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -22,7 +22,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 91863340..c5f58ba8 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -25,7 +25,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 36d67501..0d578951 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -8,7 +8,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 66cde8a2..e97127b4 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -27,7 +27,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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, portdbapi
diff --git a/bin/env-update b/bin/env-update
index 7be4a09f..29487680 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -27,7 +27,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 f96ee74f..19eb3142 100755
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -9,7 +9,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 88ccaed6..388a9ad4 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -9,7 +9,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 d6e563f9..3525ea11 100755
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -9,7 +9,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 e842f38f..4c0dd6c9 100755
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -8,7 +8,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 dc0361eb..f4812a26 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -357,7 +357,7 @@ def main():
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 b43f5c7c..ebac4a59 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -8,7 +8,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 6ea782b6..7555fdc0 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -27,7 +27,7 @@ try:
import portage
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ 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 ee348b5a..4fc1eb9f 100755
--- a/bin/xpak
+++ b/bin/xpak
@@ -12,7 +12,7 @@ try:
import xpak
except ImportError:
from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(__file__)), "pym"))
+ sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
import xpak
xpak.xpak(sys.argv[1],sys.argv[2])