diff options
| -rw-r--r-- | files/ChangeLog | 8 | ||||
| -rw-r--r-- | files/core-functions.sh | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/files/ChangeLog b/files/ChangeLog index 29ed27d..1d023a5 100644 --- a/files/ChangeLog +++ b/files/ChangeLog @@ -1,6 +1,14 @@ For Next Release --------------- + - Allow blacklisting of individual packages without collateral + damage (e.g. glibc ---> glibc-*). This changes the prior behavior + of the blacklist function; previously, adding "glibc" to the + blacklist would cause glibc, glibc-profile, glibc-zoneinfo, et al + to be ignored by slackpkg. The new behavior is that *only* the + glibc package is ignored. If you want to blacklist all packages + whose names begin with glibc, you would need to add "glibc.*" to + the blacklist now. (David Woodfall) - Add support for listing .new files without PAGER (David Woodfall) - Remove switch.ch mirrors - Add config option to allow *not* saving .orig configs (Darren Austin) diff --git a/files/core-functions.sh b/files/core-functions.sh index a976df6..d8756d3 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -572,7 +572,7 @@ function listpkgname() { } function applyblacklist() { - grep -vEw -f ${TMPDIR}/blacklist + grep -vE -f ${TMPDIR}/blacklist } # Function to make install/reinstall/upgrade lists @@ -584,7 +584,10 @@ function makelist() { INPUTLIST=$@ - grep -vE "(^#|^[[:blank:]]*$)" ${CONF}/blacklist > ${TMPDIR}/blacklist + grep -vE "(^#|^[[:blank:]]*$)" ${CONF}/blacklist | \ + sed -E "s,^, ,;s,$, ,;s,^\s(extra|pasture|patches|slackware(|64)|testing|txz)\s,\1," \ + > ${TMPDIR}/blacklist + if echo $CMD | grep -q install ; then ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist else |