summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-01-27 05:02:14 +0000
committerMike Frysinger <vapier@gentoo.org>2006-01-27 05:02:14 +0000
commitea99f722f51ed96481bb7a59521838160f084e2c (patch)
tree2ac3f88f58c07f245043ef7dd7bdd2c3ac1f3c01
parent4db057c77578d6f17a2480ee4567b7b4914aee88 (diff)
downloadportage-ea99f722f51ed96481bb7a59521838160f084e2c.tar.gz
portage-ea99f722f51ed96481bb7a59521838160f084e2c.tar.bz2
portage-ea99f722f51ed96481bb7a59521838160f084e2c.zip
make env-update a bit more flexible by adding a --no-ldconfig option
svn path=/main/trunk/; revision=2592
-rwxr-xr-xbin/env-update3
-rw-r--r--pym/portage.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/env-update b/bin/env-update
index 3db5787d6..d2874ae4d 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -17,6 +17,9 @@ if "-h" in sys.argv or "--help" in sys.argv:
usage(0)
makelinks=1
+if "--no-ldconfig" in sys.argv:
+ makelinks=0
+ sys.argv.pop(sys.argv.index("--no-ldconfig"))
if len(sys.argv) > 1:
print "!!! Invalid command line options!\n"
diff --git a/pym/portage.py b/pym/portage.py
index 5c00d37c6..0ef963058 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -591,9 +591,6 @@ def env_update(makelinks=1):
oldld=None
ld_cache_update=False
- if os.environ.has_key("PORTAGE_CALLER") and \
- os.environ["PORTAGE_CALLER"] == "env-update":
- ld_cache_update = True
newld=specials["LDPATH"]
if (oldld!=newld):