diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2019-09-19 22:08:31 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2019-09-19 22:19:14 +0200 |
commit | 911a6e3cd7e056d329cf18d6bad2038f946ba65d (patch) | |
tree | 9dc58b98a07561b939a79c4ea8fd9462b9aa7032 | |
parent | baba41efcec9f510b8a6444438a6f37cf8736f85 (diff) | |
download | slackupgrade-911a6e3cd7e056d329cf18d6bad2038f946ba65d.tar.gz slackupgrade-911a6e3cd7e056d329cf18d6bad2038f946ba65d.tar.bz2 |
Augment package translations between 14.1 and 14.2. Hopefully it is complete now
Fix replace_pkglist
-rw-r--r-- | slackware-upgrade-system | 32 | ||||
-rw-r--r-- | slackware-upgrade-system.8 | 1 |
2 files changed, 27 insertions, 6 deletions
diff --git a/slackware-upgrade-system b/slackware-upgrade-system index 400212d..ad8e963 100644 --- a/slackware-upgrade-system +++ b/slackware-upgrade-system @@ -433,13 +433,17 @@ fi # names from the $remove_report. # # Reads package replacement map from the standard input. Each input line -# contains old and new package names, separated by whitespace. +# contains old and new package names, separated by whitespace. Multiple +# new package names are allowed. function replace_pkglist() { # Update candidates and save the replacement map in a temporary. + sed -r -e 's/[[:space:]]+$//' | \ sort +0 -1 | \ tee rename.$$ | \ - join -a2 -o 1.2,2.1 - candidates.$$ | \ - awk '{print $1}' | \ + join - remove.list | \ + cut -d ' ' -f 2- | \ + tr ' ' '\n' | \ + cat - candidates.$$ | \ sort -u > candidates # Use the temporary to remove the original package names from the report. awk '{print $1}' rename.$$ | \ @@ -452,9 +456,25 @@ function replace_pkglist() { case $VERSION-$newversion in 14.1-14.2) replace_pkglist <<EOF -procps procps-ng -udev eudev -portmap rpcbind +procps procps-ng +udev eudev +portmap rpcbind +ConsoleKit ConsoleKit2 +bluez-hcidump bluez +foomatic-filters cups-filters +kdeadmin kuser ksystemlog +kdenetwork kget krdc kopete kppp +kdesdk kde-dev-utils kde-dev-scripts +kdetoys kteatime amor ktux +kwallet kwalletmanager +libelf elfutils +libjpeg libjpeg-turbo +libxfcegui4 libxfce4ui +open-cobol gnu-cobol +pil python-pillow +qca-cyrus-sasl qca +qca-gnupg qca +qca-ossl qca EOF ;; *) cp remove.list $remove_report diff --git a/slackware-upgrade-system.8 b/slackware-upgrade-system.8 index 3bf327b..f2e1c88 100644 --- a/slackware-upgrade-system.8 +++ b/slackware-upgrade-system.8 @@ -49,6 +49,7 @@ The file \fBCHECKSUMS.md5\fR and its GPG signature are downloaded first. Then, the program verifies that the signature is correct. For this to succeed, you must have the Slackware Linux Project public key in your keyring. If you don't, run +.PP .EX curl -o - https://www.slackware.com/gpg-key | gpg --import .EE |