| 1 |
commit: f87d1ef9b0b79b5a9e8f59291e7173363cd7386e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 19:39:51 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 19:39:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f87d1ef9 |
| 7 |
|
| 8 |
env_update: use ldsoconf_update var |
| 9 |
|
| 10 |
This fixes an unintended change in behavior from commit |
| 11 |
a37eb8ebd2fad3f8074490a061f067e2c637f05d, so that the ldconfig call |
| 12 |
will not be skipped when ld.so.conf has been updated (though ldconfig |
| 13 |
is still never called when makelinks=False). |
| 14 |
|
| 15 |
--- |
| 16 |
pym/portage/util/env_update.py | 1 + |
| 17 |
1 files changed, 1 insertions(+), 0 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
| 20 |
index 1731663..0d80fa3 100644 |
| 21 |
--- a/pym/portage/util/env_update.py |
| 22 |
+++ b/pym/portage/util/env_update.py |
| 23 |
@@ -231,6 +231,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, |
| 24 |
|
| 25 |
if makelinks and \ |
| 26 |
not mtime_changed and \ |
| 27 |
+ and not ldsoconf_update and \ |
| 28 |
contents is not None: |
| 29 |
libdir_contents_changed = False |
| 30 |
for mypath, mydata in contents.items(): |
Archives