tazpkg rev 926
Unblock package before removing
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Sep 26 11:12:32 2016 +0300 (2016-09-26) |
parents | 906efb431d40 |
children | 9a88902937e5 |
files | modules/block modules/remove |
line diff
1.1 --- a/modules/block Fri Sep 23 21:27:01 2016 +0100 1.2 +++ b/modules/block Mon Sep 26 11:12:32 2016 +0300 1.3 @@ -42,7 +42,7 @@ 1.4 . "$INSTALLED/$2/receipt"; tazpkg call log_pkg Unblocked 1.5 _ 'Package "%s" unblocked.' "$2" 1.6 else 1.7 - _ 'Package "%s" is not blocked.' "$2" 1.8 + [ -z "$nowarning" ] && _ 'Package "%s" is not blocked.' "$2" 1.9 fi 1.10 ;; 1.11
2.1 --- a/modules/remove Fri Sep 23 21:27:01 2016 +0100 2.2 +++ b/modules/remove Mon Sep 26 11:12:32 2016 +0300 2.3 @@ -135,6 +135,11 @@ 2.4 # Removing package 2.5 title 'Removing package "%s"' "$PACKAGE" 2.6 2.7 +# Unblock package quietly; otherwise: 2.8 +# 1. We can no longer install the package one more time - because it is blocked 2.9 +# 2. We can no longer unblock the package - because it is not installed 2.10 +tazpkg -u "$PACKAGE" --nowarning | grep -v '^$' 2.11 + 2.12 # [1/5] Pre-remove commands 2.13 call_pre_remove "$INSTALLED/$PACKAGE/receipt" 2.14