make env-update a bit more flexible by adding a --no-ldconfig option

svn path=/main/trunk/; revision=2592

diff --git a/bin/env-update b/bin/env-update
index 3db5787d6ff70d39a0caa0160b55a5b6a533d4c4..d2874ae4dbe879a087493c4ed603ba019027dd30 100755 (executable)
--- 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 5c00d37c62a37022f44b5d3793c3b7f9923ecd73..0ef963058d9bc179a9efd9b97cc13c930ffd3fe1 100644 (file)
--- 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):