Skip to content

E
eepm
Commit cc6123dc authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm play common.sh: check_alternative_pkgname(): set BRANCH

parent 13b8c601
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
play.d/common.sh
View file @ cc6123dc
...@@ -148,7 +148,8 @@ check_alternative_pkgname() ...@@ -148,7 +148,8 @@ check_alternative_pkgname()
[ -n "$BASEPKGNAME" ] || return [ -n "$BASEPKGNAME" ] || return
# default: with first entry in $PEODUCTALT # default: with first entry in $PEODUCTALT
PKGNAME="$BASEPKGNAME-$(get_first $PRODUCTALT)" BRANCH=$(get_first $PRODUCTALT)
PKGNAME="$BASEPKGNAME-$BRANCH"
# override with VERSION # override with VERSION
local i local i
...@@ -159,6 +160,7 @@ check_alternative_pkgname() ...@@ -159,6 +160,7 @@ check_alternative_pkgname()
fi fi
if [ "$VERSION" = "$i" ] ; then if [ "$VERSION" = "$i" ] ; then
PKGNAME=$BASEPKGNAME-$i PKGNAME=$BASEPKGNAME-$i
BRANCH="$i"
VERSION="" VERSION=""
return return
fi fi
...@@ -171,6 +173,7 @@ check_alternative_pkgname() ...@@ -171,6 +173,7 @@ check_alternative_pkgname()
fi fi
if epm installed $BASEPKGNAME-$i ; then if epm installed $BASEPKGNAME-$i ; then
PKGNAME=$BASEPKGNAME-$i PKGNAME=$BASEPKGNAME-$i
BRANCH="$i"
break break
fi fi
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment