summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Woodfall <dave@slackbuilds.org>2021-03-14 07:11:19 +0000
committerRobby Workman <rworkman@slackware.com>2021-03-14 10:16:29 -0500
commit14566ba1b0dfd6196a24d14d053c3b3e3dd67134 (patch)
treec1a5c44a4d8feb25c370d0d97cd25d431d1b3b28
parenteb897955e93e03f8f000ecf229657d17c572be6b (diff)
downloadslackpkg-14566ba1b0dfd6196a24d14d053c3b3e3dd67134.tar.xz
Modifiy blacklist regex line ending.
-rw-r--r--files/ChangeLog4
-rw-r--r--files/core-functions.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/files/ChangeLog b/files/ChangeLog
index 06e4aec..caf0311 100644
--- a/files/ChangeLog
+++ b/files/ChangeLog
@@ -1,3 +1,7 @@
+
+---------------
+ - Modifiy blacklist regex line ending
+
Sat Mar 13 03:30:01 UTC 2021
---------------
- Release slackpkg-15.0.1
diff --git a/files/core-functions.sh b/files/core-functions.sh
index 85ceb2c..9591d65 100644
--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -611,7 +611,7 @@ function mkregex_blacklist() {
awk -f /usr/libexec/slackpkg/pkglist.awk
) | cut -d\ -f1-7 | grep -E -f ${TMPDIR}/blacklist.tmp |
awk '{print $2}' | sort -u | sed "s,[+],[+],g
- s,$,-[^-]+-($ARCH|noarch|fw)-[^-]+[\.t(b|l|x|g)z]*,g" > ${TMPDIR}/blacklist
+ s,$,-[^-]+-($ARCH|noarch|fw)-[^-]+,g" > ${TMPDIR}/blacklist
}
# Blacklist filter