diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-20 05:45:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-20 05:45:31 +0000 |
| commit | 18792bbde65228ca97fc15b5686d6175b806e925 (patch) | |
| tree | 83720b967389e536607636b579aa1a83741f34e1 /bin/ebuild.sh | |
| parent | 9366887ded3808e77843ed64682b33b17242bf0e (diff) | |
| download | portage-18792bbde65228ca97fc15b5686d6175b806e925.tar.gz portage-18792bbde65228ca97fc15b5686d6175b806e925.tar.bz2 portage-18792bbde65228ca97fc15b5686d6175b806e925.zip | |
For bug #180165, make portageq print a "Permission denied" error when appropriate and make has_version die if portageq has an unexpected exit code. (trunk r6880:6882)
svn path=/main/branches/2.1.2/; revision=6885
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 029d46a2f..6ea33964c 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -190,11 +190,19 @@ has_version() { fi # return shell-true/shell-false if exists. # Takes single depend-type atoms. - if "${PORTAGE_BIN_PATH}/portageq" 'has_version' "${ROOT}" "$1"; then - return 0 - else - return 1 - fi + "${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1" + local retval=$? + case "${retval}" in + 0) + return 0 + ;; + 1) + return 1 + ;; + *) + die "unexpected portageq exit code: ${retval}" + ;; + esac } portageq() { |