ston1th/openup
1
0
Fork 0
forked from mirrors/openup
Code Releases Activity

Do not through an error when we check for old binpatches and no binpatch is installed.

Browse source
This commit is contained in:
Antoine Jacoutot 2014-01-16 09:25:02 +01:00
commit 08928ff242
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openup
View file

@ -155,8 +155,8 @@ check_openupd() {
# modify nor error out on installed files from newer release/binpatch) # modify nor error out on installed files from newer release/binpatch)
rm_old_bp() { rm_old_bp() {
local _bp local _bp
local _BPDB=$(ls -d /var/db/binpatch/{binpatch-,}[0-9]* |grep -v ${_REL}) local _BPDB=$(ls -d /var/db/binpatch/{binpatch-,}[0-9]* 2>/dev/null |grep -v ${_REL})
local _BPPKG=$(ls -d /var/db/pkg/binpatch* |grep -v binpatch${_REL_INT}) local _BPPKG=$(ls -d /var/db/pkg/binpatch* 2>/dev/null |grep -v binpatch${_REL_INT})
if [ -n "${_BPPKG}" -o -n "${_BPDB}" ]; then if [ -n "${_BPPKG}" -o -n "${_BPDB}" ]; then
pr_bigarrow "Removing old release binpatch entries" pr_bigarrow "Removing old release binpatch entries"
fi fi
@ -217,7 +217,7 @@ check_vuxml() {
_PKG_MATCH=$(grep -Eo '<name>('"${_PAT}"')</name>' ${_TMPVUXML} | \ _PKG_MATCH=$(grep -Eo '<name>('"${_PAT}"')</name>' ${_TMPVUXML} | \
sort -u | sed -e 's,<name>,,g;s,</name>,,g') sort -u | sed -e 's,<name>,,g;s,</name>,,g')
_OUTDATED=$((pkg_add -qnv -D nosig ${_BP_MATCH}; pkg_add -qnuv -D nosig ${_PKG_MATCH}) 2>/dev/null | \ _OUTDATED=$((pkg_add -qnv -Dnosig ${_BP_MATCH}; pkg_add -qnuv -Dnosig ${_PKG_MATCH}) 2>/dev/null | \
grep '^Adding.*(pretending)' | \ grep '^Adding.*(pretending)' | \
sort -u | \ sort -u | \
sed -e 's,Adding ,,;s,(pretending),,;s,->.*,,' | \ sed -e 's,Adding ,,;s,(pretending),,;s,->.*,,' | \
@ -253,9 +253,9 @@ do_i_need_to_reboot() {
while getopts 'KScn' arg; do while getopts 'KScn' arg; do
case ${arg} in case ${arg} in
K) exclude_kernel=1 ;; K) exclude_kernel=1 ;;
S) nosig=1; pkg_opt="${pkg_opt} -D nosig" ;; S) nosig=1; pkg_opt="${pkg_opt} -Dnosig" ;;
c) checkmode=1 ;; c) checkmode=1 ;;
n) dryrun=" (dry run)"; pkg_opt="${pkg_opt} -n -D nosig" ;; n) dryrun=" (dry run)"; pkg_opt="${pkg_opt} -n -Dnosig" ;;
*) usage ;; *) usage ;;
esac esac
done done