From 9c2719ff0f0d99ad811fdd274fcdd8fc55b37488 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Thu, 11 Feb 2021 19:03:30 -0600
Subject: Further fixup/enhancement to blacklisting issues
---
files/core-functions.sh | 5 -----
files/slackpkg | 14 +++-----------
2 files changed, 3 insertions(+), 16 deletions(-)
(limited to 'files')
diff --git a/files/core-functions.sh b/files/core-functions.sh
index a4277b1..ea32e12 100644
--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -1286,11 +1286,6 @@ Remove or blacklist the affected packages in order for slackpkg to work properly
fi
}
-function blacklist_pkg() {
- echo -e "\nThis function no longer adds packages to your blacklist.\n\
-As of slackpkg 15.0, you will need to edit ${CONF}/blacklist instead.\n"
-}
-
function remove_pkg() {
local i
diff --git a/files/slackpkg b/files/slackpkg
index e555a25..b822e84 100644
--- a/files/slackpkg
+++ b/files/slackpkg
@@ -476,17 +476,9 @@ case "$CMD" in
fi
;;
blacklist)
- #
- # If blacklist is called without package name, list
- # all blacklisted packages
- if [ "$INPUTLIST" = "" ]; then
- echo -e "Packages in blacklist:\n"
- grep -v "^#" $CONF/blacklist | $MORECMD
- cleanup
- fi
-
- # As of 15.0, this function just runs /bin/false and exits with a comment
- blacklist_pkg
+ echo -e "Edit /etc/slackpkg/blacklist to add or remove packages."
+ echo -e "Packages in blacklist:\n"
+ grep -v "^#" $CONF/blacklist | $MORECMD
;;
file-search)
PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g')
--
cgit v1.2.3