| 1 |
commit: cbbf2f3507bc425cc95c66b8d4451696370bcf30 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 26 16:22:12 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 26 16:22:12 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cbbf2f35 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
|
| 11 |
NEWS | 6 + |
| 12 |
man/emerge.1 | 8 +- |
| 13 |
pym/_emerge/BinpkgFetcher.py | 2 + |
| 14 |
pym/_emerge/EbuildBuild.py | 1 + |
| 15 |
pym/_emerge/Scheduler.py | 44 +++--- |
| 16 |
pym/_emerge/SpawnProcess.py | 14 ++- |
| 17 |
pym/_emerge/actions.py | 18 ++- |
| 18 |
pym/_emerge/depgraph.py | 19 +-- |
| 19 |
pym/_emerge/help.py | 9 +- |
| 20 |
pym/_emerge/main.py | 13 ++- |
| 21 |
pym/portage/_sets/dbapi.py | 20 +-- |
| 22 |
pym/portage/_sets/libs.py | 21 ++- |
| 23 |
pym/portage/dbapi/vartree.py | 23 ++- |
| 24 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 198 +++++++++++++++++++++------ |
| 25 |
14 files changed, 269 insertions(+), 127 deletions(-) |
| 26 |
|
| 27 |
diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 28 |
index abd0db9,52670d9..259f45b |
| 29 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 30 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 31 |
@@@ -220,9 -232,9 +233,9 @@@ class LinkageMapELF(object) |
| 32 |
# already represented via the preserve_paths |
| 33 |
# parameter. |
| 34 |
continue |
| 35 |
- plibs.update(items) |
| 36 |
+ plibs.update((x, cpv) for x in items) |
| 37 |
if plibs: |
| 38 |
- args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
| 39 |
+ args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
| 40 |
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ |
| 41 |
for x in plibs) |
| 42 |
try: |
Archives