From 195cbe37b67551156444273fc96d6859b77c97c1 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <antoine@mtier.org>
Date: Sat, 19 Apr 2014 17:35:27 +0200
Subject: [PATCH] Simplify pkg updates and do not call `-u' against a pkg list,
 otherwise we may ebd up updating packages we do not want (e.g. moving from
 squid-2.7 to squid-3 -- where both packages are available).

Fixes #7257
---
 openup | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openup b/openup
index b64c11e..9aeb2b7 100755
--- a/openup
+++ b/openup
@@ -186,11 +186,10 @@ update_binpatches() {
 update_pkg() {
 	local _CMD _PKG
 
-	_PKG=$(pkg_info -q | perl -ne '/^(.*)-(\d[^-]*)[-]?(\w*)(.*)$/ && print "$1\n"' | \
-	       grep -v binpatch${_REL_INT}-${_ARCH})
+	_PKG=$(pkg_info -q | grep -v binpatch${_REL_INT}-${_ARCH})
 
 	pr_bigarrow "Updating package(s)"
-	_CMD="pkg_add -u ${pkg_opt}"
+	_CMD="pkg_add -qrz ${pkg_opt}"
 	pr_smallarrow "${_CMD}"
 	# we don't want to display ${_PKG}, there could be hundreds
 	_CMD="${_CMD} ${_PKG}"