xbps-src: verify_rundeps: make sure that newrev is only incr once.
This commit is contained in:
parent
cb1d5fbc43
commit
6fe5680fa6
1 changed files with 4 additions and 4 deletions
|
@ -44,7 +44,7 @@ find_rundep()
|
||||||
verify_rundeps()
|
verify_rundeps()
|
||||||
{
|
{
|
||||||
local j f nlib verify_deps maplib found_dup igndir
|
local j f nlib verify_deps maplib found_dup igndir
|
||||||
local broken rdep found rsonamef soname_list revbumped tmplf
|
local broken rdep found rsonamef soname_list revbumped tmplf newrev
|
||||||
|
|
||||||
maplib="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt"
|
maplib="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt"
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ verify_rundeps()
|
||||||
Add_dependency run ${_rdep}
|
Add_dependency run ${_rdep}
|
||||||
|
|
||||||
fi
|
fi
|
||||||
unset rdep _rdep rdepcnt _rev newrev
|
unset rdep _rdep rdepcnt _rev
|
||||||
done
|
done
|
||||||
unset revbumped
|
unset revbumped
|
||||||
#
|
#
|
||||||
|
@ -190,8 +190,8 @@ verify_rundeps()
|
||||||
msg_warn "$pkgver: shlibs changed... package has been revbumped!\n"
|
msg_warn "$pkgver: shlibs changed... package has been revbumped!\n"
|
||||||
_rev=$(egrep '^revision=.*' $tmplf)
|
_rev=$(egrep '^revision=.*' $tmplf)
|
||||||
if [ -n "${_rev}" ]; then
|
if [ -n "${_rev}" ]; then
|
||||||
newrev=$((${_rev#revision=} + 1))
|
|
||||||
if [ -z "$revbumped" ]; then
|
if [ -z "$revbumped" ]; then
|
||||||
|
readonly newrev=$((${_rev#revision=} + 1))
|
||||||
sed -i "s/^revision=.*$/revision=${newrev}/" $tmplf
|
sed -i "s/^revision=.*$/revision=${newrev}/" $tmplf
|
||||||
export revision=${newrev}
|
export revision=${newrev}
|
||||||
revbumped=1
|
revbumped=1
|
||||||
|
@ -199,7 +199,7 @@ verify_rundeps()
|
||||||
else
|
else
|
||||||
if [ -z "$revbumped" ]; then
|
if [ -z "$revbumped" ]; then
|
||||||
sed -i "/^short_desc=.*$/irevision=1" $tmplf
|
sed -i "/^short_desc=.*$/irevision=1" $tmplf
|
||||||
export revision=${newrev}
|
export revision=1
|
||||||
revbumped=1
|
revbumped=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue