From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CB767198005 for ; Thu, 28 Feb 2013 19:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CC72E073C; Thu, 28 Feb 2013 19:29:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07B71E073C for ; Thu, 28 Feb 2013 19:29:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF08C33DC5B for ; Thu, 28 Feb 2013 19:29:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 64BD4E41E2 for ; Thu, 28 Feb 2013 19:29:41 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1362079759.5121499e217fa1e0b67d177dbc10abd957ddec22.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 5121499e217fa1e0b67d177dbc10abd957ddec22 X-VCS-Branch: prefix Date: Thu, 28 Feb 2013 19:29:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e37de345-8d2e-4464-a65b-8a43fbf2192f X-Archives-Hash: f0185d09845133fe23ca7d67b0a2957a commit: 5121499e217fa1e0b67d177dbc10abd957ddec22 Author: Fabian Groffen gentoo org> AuthorDate: Thu Feb 28 19:29:19 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Feb 28 19:29:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5121499e Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-helpers/preplib bin/misc-functions.sh pym/_emerge/getloadavg.py bin/archive-conf | 4 +- bin/ebuild | 3 +- bin/ebuild-helpers/preplib | 32 -- bin/misc-functions.sh | 27 +- bin/phase-functions.sh | 2 +- bin/phase-helpers.sh | 12 +- bin/portageq | 38 +- bin/repoman | 471 ++++++++++---------- doc/qa.docbook | 2 +- man/emerge.1 | 4 +- man/ru/ebuild.1 | 2 +- man/ru/env-update.1 | 6 +- pym/_emerge/Scheduler.py | 20 +- pym/_emerge/actions.py | 73 ++-- pym/_emerge/depgraph.py | 394 ++++++++++++++--- pym/_emerge/getloadavg.py | 5 +- pym/_emerge/help.py | 2 +- pym/_emerge/resolver/output.py | 114 +++--- pym/_emerge/resolver/output_helpers.py | 3 +- pym/portage/__init__.py | 41 +- pym/portage/_sets/files.py | 6 +- pym/portage/dbapi/__init__.py | 6 +- pym/portage/package/ebuild/_config/UseManager.py | 12 +- .../package/ebuild/_config/special_env_vars.py | 4 +- pym/portage/package/ebuild/config.py | 47 ++- .../package/ebuild/deprecated_profile_check.py | 46 ++- pym/portage/package/ebuild/digestgen.py | 107 +++--- pym/portage/process.py | 4 + pym/portage/tests/emerge/test_simple.py | 2 +- pym/portage/tests/lint/test_compile_modules.py | 20 +- ...test_complete_if_new_subslot_without_revbump.py | 74 +++ .../test_regular_slot_change_without_revbump.py | 59 +++ .../resolver/test_slot_change_without_revbump.py | 69 +++ .../tests/resolver/test_slot_operator_unsolved.py | 88 ++++ pym/portage/util/_dyn_libs/LinkageMapELF.py | 6 +- pym/portage/util/_eventloop/EventLoop.py | 8 +- pym/repoman/checks.py | 23 +- pym/repoman/utilities.py | 5 +- 38 files changed, 1251 insertions(+), 590 deletions(-) diff --cc bin/misc-functions.sh index 29b9615,ba4fb0f..2d75c92 mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@@ -507,9 -467,7 +508,9 @@@ install_qa_check_elf() # Check for shared libraries lacking NEEDED entries qa_var="QA_DT_NEEDED_${ARCH/-/_}" eval "[[ -n \${!qa_var} ]] && QA_DT_NEEDED=(\"\${${qa_var}[@]}\")" - f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:") + # PREFIX LOCAL: keep offset prefix in the recorded files - f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:") ++ f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:") + # END PREFIX LOCAL if [[ -n ${f} ]] ; then echo "${f}" > "${T}"/scanelf-missing-NEEDED.log if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then diff --cc pym/_emerge/getloadavg.py index 8e62ebf,6a2794f..637d011 --- a/pym/_emerge/getloadavg.py +++ b/pym/_emerge/getloadavg.py @@@ -12,16 -11,9 +12,17 @@@ if getloadavg is None Raises OSError if the load average was unobtainable. """ try: - with open('/proc/loadavg') as f: - loadavg_str = f.readline() - except IOError: + if platform.system() in ["AIX", "HP-UX"]: + loadavg_str = os.popen('LANG=C /usr/bin/uptime 2>/dev/null').readline().split() + while loadavg_str[0] != 'load' and loadavg_str[1] != 'average:': + loadavg_str = loadavg_str[1:] + loadavg_str = loadavg_str[2:5] + loadavg_str = [x.rstrip(',') for x in loadavg_str] + loadavg_str = ' '.join(loadavg_str) + else: - loadavg_str = open('/proc/loadavg').readline() ++ with open('/proc/loadavg') as f: ++ loadavg_str = f.readline() + except (IOError, IndexError): # getloadavg() is only supposed to raise OSError, so convert raise OSError('unknown') loadavg_split = loadavg_str.split()