From d4c86857c3bb2b127e3e25671b35487e93ed4194 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Wed, 23 Sep 2015 17:05:07 -0300
Subject: Verify if pkg is (un)locked before (un)lock it

---
 src/usr/local/sbin/pfSense-upgrade | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/usr/local/sbin')

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 978fd83..5325af8 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -134,7 +134,9 @@ _exit() {
 	trap "-" 1 2 15 EXIT
 
 	if [ -n "${kernel_pkg}" ]; then
-		_exec "pkg lock ${kernel_pkg}" "Locking kernel package" mute ignore_result
+		if [ "$(pkg query %k ${kernel_pkg})" = "0" ]; then
+			_exec "pkg lock ${kernel_pkg}" "Locking kernel package" mute ignore_result
+		fi
 	fi
 	if [ -f "${pid_file}" ]; then
 		rm -f ${pid_file}
@@ -176,7 +178,9 @@ first_step() {
 
 	if [ "${kernel_version_compare}" = "<" ]; then
 		kernel_update=1
-		_exec "pkg unlock ${kernel_pkg}" "Unlocking kernel package" mute ignore_result
+		if [ "$(pkg query %k ${kernel_pkg})" = "1" ]; then
+			_exec "pkg unlock ${kernel_pkg}" "Unlocking kernel package" mute ignore_result
+		fi
 	elif [ "${kernel_version_compare}" = "=" ]; then
 		kernel_update=0
 	elif [ "${kernel_version_compare}" = ">" ]; then
-- 
cgit v1.1