diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-02-10 12:42:52 -0700 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2013-02-10 12:13:39 -0800 |
| commit | b9e0ee1bff068c7a161890294c259f6a04b4315a (patch) | |
| tree | dfc5eebd1a46557b2b6a735a37d82c5d22db35ee | |
| parent | Fix some ResourceWarnings. (diff) | |
| download | portage-b9e0ee1bff068c7a161890294c259f6a04b4315a.tar.gz portage-b9e0ee1bff068c7a161890294c259f6a04b4315a.tar.bz2 portage-b9e0ee1bff068c7a161890294c259f6a04b4315a.zip | |
Avoid using gawk, where generic awk is enough
| -rwxr-xr-x | bin/misc-functions.sh | 4 | ||||
| -rw-r--r-- | pym/portage/tests/emerge/test_simple.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index ddd917934..f23545e5b 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -432,7 +432,7 @@ install_qa_check() { # Check for shared libraries lacking SONAMEs qa_var="QA_SONAME_${ARCH/-/_}" eval "[[ -n \${!qa_var} ]] && QA_SONAME=(\"\${${qa_var}[@]}\")" - f=$(scanelf -ByF '%S %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:") + f=$(scanelf -ByF '%S %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:") if [[ -n ${f} ]] ; then echo "${f}" > "${T}"/scanelf-missing-SONAME.log if [[ "${QA_STRICT_SONAME-unset}" == unset ]] ; then @@ -466,7 +466,7 @@ install_qa_check() { # 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* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:") + f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:") if [[ -n ${f} ]] ; then echo "${f}" > "${T}"/scanelf-missing-NEEDED.log if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 282a045ed..5c0d821e0 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -316,7 +316,7 @@ pkg_preinst() { # Override things that may be unavailable, or may have portability # issues when running tests in exotic environments. # prepstrip - bug #447810 (bash read builtin EINTR problem) - true_symlinks = ["find", "gawk", "prepstrip", "sed", "scanelf"] + true_symlinks = ["find", "prepstrip", "sed", "scanelf"] true_binary = find_binary("true") self.assertEqual(true_binary is None, False, "true command not found") |