From 7c210bb7145727d14e4da6879a8368130900d6c9 Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Fri, 15 Jun 2018 17:12:06 +0200
Subject: [PATCH] Fri Jun 15 16:09:51 CEST 2018
 pkg/slackpkg+-1.7.0d1-noarch-4mt.txz   - Fix incompatibility with
 slackpkg-2.83.0-noarch-3   - Fix setupmultilib script. It did use oldstyle
 'multilib:'   - Fix a regression in TAG PRIORITY   - Handle the case where
 /var/log/packages is a symlink

---
 ChangeLog.txt       | 9 +++++++++
 src/ChangeLog.txt   | 9 +++++++++
 src/slackpkgplus.sh | 6 +++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ada57ce..e5a2ab6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
+Fri Jun 15 16:09:51 CEST 2018
+pkg/slackpkg+-1.7.0d1-noarch-4mt.txz
+  - Fix incompatibility with slackpkg-2.83.0-noarch-3
+  - Fix setupmultilib script. It did use oldstyle 'multilib:'
+  - Fix a regression in TAG PRIORITY
+  - Handle the case where /var/log/packages is a symlink
+ 
++-------------------------+
+
 Thu Apr 26 23:49:04 CEST 2018
 pkg/slackpkg+-1.7.0d1-noarch-3mt.txz
   - Do not log 'install.log' and 'fatal.log' when DOWNLOADONLY=on
diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt
index ada57ce..e5a2ab6 100644
--- a/src/ChangeLog.txt
+++ b/src/ChangeLog.txt
@@ -1,3 +1,12 @@
+Fri Jun 15 16:09:51 CEST 2018
+pkg/slackpkg+-1.7.0d1-noarch-4mt.txz
+  - Fix incompatibility with slackpkg-2.83.0-noarch-3
+  - Fix setupmultilib script. It did use oldstyle 'multilib:'
+  - Fix a regression in TAG PRIORITY
+  - Handle the case where /var/log/packages is a symlink
+ 
++-------------------------+
+
 Thu Apr 26 23:49:04 CEST 2018
 pkg/slackpkg+-1.7.0d1-noarch-3mt.txz
   - Do not log 'install.log' and 'fatal.log' when DOWNLOADONLY=on
diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 052ab16..483b4eb 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -301,7 +301,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       done
       DELALL="$OLDDEL"
     fi
-    ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist
+    ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist
 
     for i in $SHOWLIST; do
       PKGFOUND=$(grep -m1 -e "^$(echo $i|rev|cut -f4- -d-|rev)-[^-]\+-[^-]\+-[^-]\+$" $TMPDIR/tmplist)
@@ -1150,7 +1150,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     {
     echo "[ Status#] [ Repository#] [ Package# ]"
 
-    INSTPKGS="$(ls -f $ROOT/var/log/packages)"
+    INSTPKGS="$(ls -f $ROOT/var/log/packages/)"
 
     for i in $1; do
       REPO=${i/:*/} #$(echo "$i" | cut -f1 -d":")
@@ -1342,7 +1342,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       rm -f $TMPDIR/dialog.tmp
       
       if [ "$2" = "upgrade" ]; then
-        ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist
+        ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist
         for i in $1; do
           TMPONOFF=$ONOFF
           BASENAME=$(cutpkg $i)