From 08928ff24269450b69e0a973483c7cc3e8d19e92 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <antoine@mtier.org>
Date: Thu, 16 Jan 2014 09:25:02 +0100
Subject: [PATCH] Do not through an error when we check for old binpatches and
 no binpatch is installed.

---
 openup | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openup b/openup
index 6b5010b..b64c11e 100755
--- a/openup
+++ b/openup
@@ -155,8 +155,8 @@ check_openupd() {
 # modify nor error out on installed files from newer release/binpatch)
 rm_old_bp() {
 	local _bp
-	local _BPDB=$(ls -d /var/db/binpatch/{binpatch-,}[0-9]* |grep -v ${_REL})
-	local _BPPKG=$(ls -d /var/db/pkg/binpatch* |grep -v binpatch${_REL_INT})
+	local _BPDB=$(ls -d /var/db/binpatch/{binpatch-,}[0-9]* 2>/dev/null |grep -v ${_REL})
+	local _BPPKG=$(ls -d /var/db/pkg/binpatch* 2>/dev/null |grep -v binpatch${_REL_INT})
 	if [ -n "${_BPPKG}" -o -n "${_BPDB}" ]; then
 		pr_bigarrow "Removing old release binpatch entries"
 	fi
@@ -217,7 +217,7 @@ check_vuxml() {
 	_PKG_MATCH=$(grep -Eo '<name>('"${_PAT}"')</name>' ${_TMPVUXML} | \
 		     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)' | \
 		    sort -u | \
 		    sed -e 's,Adding ,,;s,(pretending),,;s,->.*,,' | \
@@ -253,9 +253,9 @@ do_i_need_to_reboot() {
 while getopts 'KScn' arg; do
 	case ${arg} in
 	K)	exclude_kernel=1 ;;
-	S)	nosig=1; pkg_opt="${pkg_opt} -D nosig" ;;
+	S)	nosig=1; pkg_opt="${pkg_opt} -Dnosig" ;;
 	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 ;;
 	esac
 done