From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 27 Jan 2006 05:02:14 +0000 (-0000)
Subject: make env-update a bit more flexible by adding a --no-ldconfig option
X-Git-Tag: v2.1_pre4~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea99f722f51ed96481bb7a59521838160f084e2c;p=portage.git

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 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):