diff options
| author | Robby Workman <rworkman@slackware.com> | 2021-02-11 19:03:30 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2021-02-11 19:06:31 -0600 |
| commit | 9c2719ff0f0d99ad811fdd274fcdd8fc55b37488 (patch) | |
| tree | 44590e1bebea0d261cc3419b5648a853c28692bd | |
| parent | 0635933b1eab51aa63c921e62ee5f2e82fd79efb (diff) | |
| download | slackpkg-9c2719ff0f0d99ad811fdd274fcdd8fc55b37488.tar.xz | |
Further fixup/enhancement to blacklisting issues
| -rw-r--r-- | files/core-functions.sh | 5 | ||||
| -rw-r--r-- | files/slackpkg | 14 |
2 files changed, 3 insertions, 16 deletions
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') |