summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-04-01 09:39:59 +0000
committerMike Frysinger <vapier@gentoo.org>2006-04-01 09:39:59 +0000
commit2f599276601a2218d9bec8d89129895f152cf42f (patch)
treea614217773009d45f7342eb1556298e4df680a09
parentRename local 'root' variable to parent_dir so that it's not confused with por... (diff)
downloadportage-multirepo-2f599276601a2218d9bec8d89129895f152cf42f.tar.gz
portage-multirepo-2f599276601a2218d9bec8d89129895f152cf42f.tar.bz2
portage-multirepo-2f599276601a2218d9bec8d89129895f152cf42f.zip
fix makelinks logic again
svn path=/main/trunk/; revision=3048
-rw-r--r--pym/portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 0c808df0..0c348bd4 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -643,7 +643,7 @@ def env_update(makelinks=1, srcroot=None):
mtime_changed = True
if mtime_changed:
- if makelinks or srcroot is None:
+ if srcroot is None:
ld_cache_update = True
continue
src_dir = os.path.join(srcroot, x.lstrip(os.sep))
@@ -656,7 +656,7 @@ def env_update(makelinks=1, srcroot=None):
break
# Only run ldconfig as needed
- if ld_cache_update:
+ if (ld_cache_update or makelinks):
# ldconfig has very different behaviour between FreeBSD and Linux
if ostype=="Linux" or ostype.lower().endswith("gnu"):
# We can't update links if we haven't cleaned other versions first, as