diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-05-30 23:32:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-05-30 23:32:08 -0700 |
| commit | 415d33de1692a65c60730da961ad3d787346b375 (patch) | |
| tree | 424dd2e4ebb8cdc046d9f06ea863d04546df9bff /bin/ebuild.sh | |
| parent | Make depgraph._serialize_tasks show a debug message when it (diff) | |
| download | portage-idfetch-415d33de1692a65c60730da961ad3d787346b375.tar.gz portage-idfetch-415d33de1692a65c60730da961ad3d787346b375.tar.bz2 portage-idfetch-415d33de1692a65c60730da961ad3d787346b375.zip | |
Bug #322049 - Make use_with() and use_enable() handling of empty
3rd argument conditional on EAPI in order to ensure backward
compatibility. This reverts the behavior change from commit
a05bba76435d94407fd25549d0552902962baf62 for EAPI 0, 1, 2, and 3.
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b46d14a6..9784298c 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -230,7 +230,11 @@ use_with() { return 1 fi - local UW_SUFFIX=${3+=$3} + if ! has "${EAPI:-0}" 0 1 2 3 ; then + local UW_SUFFIX=${3+=$3} + else + local UW_SUFFIX=${3:+=$3} + fi local UWORD=${2:-$1} if useq $1; then @@ -248,7 +252,11 @@ use_enable() { return 1 fi - local UE_SUFFIX=${3+=$3} + if ! has "${EAPI:-0}" 0 1 2 3 ; then + local UE_SUFFIX=${3+=$3} + else + local UE_SUFFIX=${3:+=$3} + fi local UWORD=${2:-$1} if useq $1; then |