From c24c2dd5d6917c05815f1b3f70f552424408bbb5 Mon Sep 17 00:00:00 2001 From: arcctgx Date: Wed, 25 Apr 2018 20:16:03 +0200 Subject: [PATCH] sbopkg: Fix bug in updates_compare_versions() The loop index $i was not protected with curly braces in eval statement of variable LEFT. When i=10 that statement was not evaluated as $10, but as $1 concatenated with the digit 0. Corrected description of outputs of updates_compare_versions(). Fixed #41. Signed-off-by: Willy Sudiarto Raharjo --- src/usr/doc/THANKS | 1 + src/usr/sbin/sbopkg | 4 ++-- tools/ChangeLog-latest.txt | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/usr/doc/THANKS b/src/usr/doc/THANKS index 6d0fa45..5b51f00 100644 --- a/src/usr/doc/THANKS +++ b/src/usr/doc/THANKS @@ -92,3 +92,4 @@ We moved to github, so revision number no longer used Loki Harfagr Alan Erich Ritz + arcctgx diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index dc69d86..fab4922 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -971,14 +971,14 @@ updates_compare_versions() { # 1.2.50 build 4, the argument list is # 1 2 3 7 1 2 50 4 # Prints -1 if the "left" package is newer (not an update), 0 if - # the version is unchanged, 1 if the "left" package is newer. + # the version is unchanged, 1 if the "left" package is older. local COUNT=$(($# / 2)) local i RESULT=0 local LEFT RIGHT for ((i=1; i<=$COUNT; i++)); do - eval LEFT=\$$i + eval LEFT=\${$i} eval RIGHT=\${$(($i + $COUNT))} if [[ 10#$LEFT -lt 10#$RIGHT ]]; then RESULT=1 diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt index 17fdbad..8886e5c 100644 --- a/tools/ChangeLog-latest.txt +++ b/tools/ChangeLog-latest.txt @@ -1,6 +1,6 @@ SBOPKG NEWS -sbopkg-dev (2018-04-25 10:27:24 UTC) +sbopkg-dev (2018-04-26 00:253:36 UTC) FEATURES * sqg: Parallelize building of single and all packages by option -j. Patch by Marcel Saegebarth. @@ -35,6 +35,8 @@ sbopkg-dev (2018-04-25 10:27:24 UTC) Patch by Alan * Use correct SlackBuild file name to build package Patch by Erich Ritz + * Fix bug in updates_compare_versions() + Patch by arcctgx (#41) sbopkg 0.38.1 (2016-09-01 13:42 UTC) FEATURES