minor bug fix
This commit is contained in:
parent
82743c6f67
commit
fc43fb0567
4
etools
4
etools
@ -68,8 +68,8 @@ function etools_get_version() {
|
|||||||
if [ "$arch" = "x86_64" ]; then
|
if [ "$arch" = "x86_64" ]; then
|
||||||
arch="amd64"
|
arch="amd64"
|
||||||
fi
|
fi
|
||||||
if [[ "$ACCEPT_KEYWORDS" == *"~$arch"* ]] || _matches_testing "$1" "\~$arch"; then
|
if [[ "$ACCEPT_KEYWORDS" == *~$arch* ]] || _matches_testing "$1" "~$arch"; then
|
||||||
latest=$(_get_latest "$1" "${2:-${package_offset[$1]:-0}}" "~$arch")
|
latest=$(_get_latest "$1" "${2:-${package_offset[$1]:-0}}" "$arch")
|
||||||
fi
|
fi
|
||||||
[ -n "$latest" ] && _extract_version "$latest" && "$ETOOLS_DIR"/helper.sh && return 0;
|
[ -n "$latest" ] && _extract_version "$latest" && "$ETOOLS_DIR"/helper.sh && return 0;
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -170,7 +170,7 @@ function _matches_live() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function _matches_testing() {
|
function _matches_testing() {
|
||||||
[[ "$ACCEPT_KEYWORDS" == *"~amd64"* ]] && return 0;
|
[[ "$ACCEPT_KEYWORDS" == *~$3* ]] && return 0;
|
||||||
[ ! -f /etc/portage/package.accept_keywords ] && \
|
[ ! -f /etc/portage/package.accept_keywords ] && \
|
||||||
[ ! -d /etc/portage/package.accept_keywords ] && \
|
[ ! -d /etc/portage/package.accept_keywords ] && \
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user