| 1 |
commit: 5121499e217fa1e0b67d177dbc10abd957ddec22 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 28 19:29:19 2013 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 28 19:29:19 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5121499e |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
bin/ebuild-helpers/preplib |
| 12 |
bin/misc-functions.sh |
| 13 |
pym/_emerge/getloadavg.py |
| 14 |
|
| 15 |
|
| 16 |
bin/archive-conf | 4 +- |
| 17 |
bin/ebuild | 3 +- |
| 18 |
bin/ebuild-helpers/preplib | 32 -- |
| 19 |
bin/misc-functions.sh | 27 +- |
| 20 |
bin/phase-functions.sh | 2 +- |
| 21 |
bin/phase-helpers.sh | 12 +- |
| 22 |
bin/portageq | 38 +- |
| 23 |
bin/repoman | 471 ++++++++++---------- |
| 24 |
doc/qa.docbook | 2 +- |
| 25 |
man/emerge.1 | 4 +- |
| 26 |
man/ru/ebuild.1 | 2 +- |
| 27 |
man/ru/env-update.1 | 6 +- |
| 28 |
pym/_emerge/Scheduler.py | 20 +- |
| 29 |
pym/_emerge/actions.py | 73 ++-- |
| 30 |
pym/_emerge/depgraph.py | 394 ++++++++++++++--- |
| 31 |
pym/_emerge/getloadavg.py | 5 +- |
| 32 |
pym/_emerge/help.py | 2 +- |
| 33 |
pym/_emerge/resolver/output.py | 114 +++--- |
| 34 |
pym/_emerge/resolver/output_helpers.py | 3 +- |
| 35 |
pym/portage/__init__.py | 41 +- |
| 36 |
pym/portage/_sets/files.py | 6 +- |
| 37 |
pym/portage/dbapi/__init__.py | 6 +- |
| 38 |
pym/portage/package/ebuild/_config/UseManager.py | 12 +- |
| 39 |
.../package/ebuild/_config/special_env_vars.py | 4 +- |
| 40 |
pym/portage/package/ebuild/config.py | 47 ++- |
| 41 |
.../package/ebuild/deprecated_profile_check.py | 46 ++- |
| 42 |
pym/portage/package/ebuild/digestgen.py | 107 +++--- |
| 43 |
pym/portage/process.py | 4 + |
| 44 |
pym/portage/tests/emerge/test_simple.py | 2 +- |
| 45 |
pym/portage/tests/lint/test_compile_modules.py | 20 +- |
| 46 |
...test_complete_if_new_subslot_without_revbump.py | 74 +++ |
| 47 |
.../test_regular_slot_change_without_revbump.py | 59 +++ |
| 48 |
.../resolver/test_slot_change_without_revbump.py | 69 +++ |
| 49 |
.../tests/resolver/test_slot_operator_unsolved.py | 88 ++++ |
| 50 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 6 +- |
| 51 |
pym/portage/util/_eventloop/EventLoop.py | 8 +- |
| 52 |
pym/repoman/checks.py | 23 +- |
| 53 |
pym/repoman/utilities.py | 5 +- |
| 54 |
38 files changed, 1251 insertions(+), 590 deletions(-) |
| 55 |
|
| 56 |
diff --cc bin/misc-functions.sh |
| 57 |
index 29b9615,ba4fb0f..2d75c92 |
| 58 |
mode 100644,100755..100644 |
| 59 |
--- a/bin/misc-functions.sh |
| 60 |
+++ b/bin/misc-functions.sh |
| 61 |
@@@ -507,9 -467,7 +508,9 @@@ install_qa_check_elf() |
| 62 |
# Check for shared libraries lacking NEEDED entries |
| 63 |
qa_var="QA_DT_NEEDED_${ARCH/-/_}" |
| 64 |
eval "[[ -n \${!qa_var} ]] && QA_DT_NEEDED=(\"\${${qa_var}[@]}\")" |
| 65 |
- f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:") |
| 66 |
+ # PREFIX LOCAL: keep offset prefix in the recorded files |
| 67 |
- f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:") |
| 68 |
++ f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:") |
| 69 |
+ # END PREFIX LOCAL |
| 70 |
if [[ -n ${f} ]] ; then |
| 71 |
echo "${f}" > "${T}"/scanelf-missing-NEEDED.log |
| 72 |
if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then |
| 73 |
diff --cc pym/_emerge/getloadavg.py |
| 74 |
index 8e62ebf,6a2794f..637d011 |
| 75 |
--- a/pym/_emerge/getloadavg.py |
| 76 |
+++ b/pym/_emerge/getloadavg.py |
| 77 |
@@@ -12,16 -11,9 +12,17 @@@ if getloadavg is None |
| 78 |
Raises OSError if the load average was unobtainable. |
| 79 |
""" |
| 80 |
try: |
| 81 |
- with open('/proc/loadavg') as f: |
| 82 |
- loadavg_str = f.readline() |
| 83 |
- except IOError: |
| 84 |
+ if platform.system() in ["AIX", "HP-UX"]: |
| 85 |
+ loadavg_str = os.popen('LANG=C /usr/bin/uptime 2>/dev/null').readline().split() |
| 86 |
+ while loadavg_str[0] != 'load' and loadavg_str[1] != 'average:': |
| 87 |
+ loadavg_str = loadavg_str[1:] |
| 88 |
+ loadavg_str = loadavg_str[2:5] |
| 89 |
+ loadavg_str = [x.rstrip(',') for x in loadavg_str] |
| 90 |
+ loadavg_str = ' '.join(loadavg_str) |
| 91 |
+ else: |
| 92 |
- loadavg_str = open('/proc/loadavg').readline() |
| 93 |
++ with open('/proc/loadavg') as f: |
| 94 |
++ loadavg_str = f.readline() |
| 95 |
+ except (IOError, IndexError): |
| 96 |
# getloadavg() is only supposed to raise OSError, so convert |
| 97 |
raise OSError('unknown') |
| 98 |
loadavg_split = loadavg_str.split() |
Archives