# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1474877552 -10800
# Node ID 688515d746e180533edd590618793ba0d3c04604
# Parent  906efb431d40d6bfa5255be7c9a35599261f981f
Unblock package before removing

diff -r 906efb431d40 -r 688515d746e1 modules/block
--- a/modules/block	Fri Sep 23 21:27:01 2016 +0100
+++ b/modules/block	Mon Sep 26 11:12:32 2016 +0300
@@ -42,7 +42,7 @@
 			. "$INSTALLED/$2/receipt"; tazpkg call log_pkg Unblocked
 			_ 'Package "%s" unblocked.' "$2"
 		else
-			_ 'Package "%s" is not blocked.' "$2"
+			[ -z "$nowarning" ] && _ 'Package "%s" is not blocked.' "$2"
 		fi
 		;;
 
diff -r 906efb431d40 -r 688515d746e1 modules/remove
--- a/modules/remove	Fri Sep 23 21:27:01 2016 +0100
+++ b/modules/remove	Mon Sep 26 11:12:32 2016 +0300
@@ -135,6 +135,11 @@
 # Removing package
 title 'Removing package "%s"' "$PACKAGE"
 
+# Unblock package quietly; otherwise:
+# 1. We can no longer install the package one more time - because it is blocked
+# 2. We can no longer unblock the package - because it is not installed
+tazpkg -u "$PACKAGE" --nowarning | grep -v '^$'
+
 # [1/5] Pre-remove commands
 call_pre_remove "$INSTALLED/$PACKAGE/receipt"