diff options
| author | Michał Górny <mgorny@gentoo.org> | 2011-06-28 10:10:36 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-29 02:29:55 -0700 |
| commit | e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca (patch) | |
| tree | 19c06a878f9cd827ef4109024f7b883420eae3d3 /pym/portage/util/env_update.py | |
| parent | 31c9c68d7e96070166fe385141400fa3bcb5950e (diff) | |
| download | portage-e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca.tar.gz portage-e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca.tar.bz2 portage-e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca.zip | |
Don't ever recreate root .so links on env-update.
We install .so symlinks with packages, so let's use that instead of
letting ldconfig update them for no reason. This should fix problems
with preserved-libs.
Diffstat (limited to 'pym/portage/util/env_update.py')
| -rw-r--r-- | pym/portage/util/env_update.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py index a89f2e252..a82afdfea 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py @@ -248,10 +248,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, # we can safely create links. writemsg_level(_(">>> Regenerating %setc/ld.so.cache...\n") % \ (target_root,)) - if makelinks: - os.system("cd / ; %s -r '%s'" % (ldconfig, target_root)) - else: - os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root)) + os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root)) elif ostype in ("FreeBSD","DragonFly"): writemsg_level(_(">>> Regenerating %svar/run/ld-elf.so.hints...\n") % \ target_root) |