From 27d215115db2560ea5a8885d3276caca2b93fabd Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Tue, 30 Aug 2016 06:11:29 +0700 Subject: [PATCH] sbopkg: Do not use wildcard. As many package name now uses xx.yy format, it may failed to detect the correct package name. Thanks to Chris Abela. Fix #19. Signed-off-by: Willy Sudiarto Raharjo --- src/usr/doc/THANKS | 1 + src/usr/sbin/sbopkg | 6 +++--- tools/ChangeLog-latest.txt | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/usr/doc/THANKS b/src/usr/doc/THANKS index 25ede2d..5cc1df2 100644 --- a/src/usr/doc/THANKS +++ b/src/usr/doc/THANKS @@ -86,3 +86,4 @@ We moved to github, so revision number no longer used Philippe Delavalade pyllyukko Dhaby Xiloj + Chris Abela diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index de51de1..f25f02f 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -1415,7 +1415,7 @@ check_gpg() { $GPGNAME tarball found.")" 8 40 return 1 fi - if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then + if ! gpg --verify $CHKPKG.tar.gz.asc > /dev/null 2>&1; then dialog --title "WARNING" --yesno "$(crunch "GPG CHECK FAILED!\n\n \ Would you like to delete the $GPGNAME directory and tarball \ so you can perform a new sync? If so, all local changes to \ @@ -3757,9 +3757,9 @@ check_asc() { local REPLY echo -n " Checking GPG for $GPGNAME.tar.gz ... " >> $TMPLOG - if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then + if ! gpg --verify $CHKPKG.tar.gz.asc > /dev/null 2>&1; then echo "GPG check FAILED!" | tee -a $TMPLOG - if [[ ! -e $CHKPKG.tar.gz && ! -e $CHKPKG.*.asc ]]; then + if [[ ! -e $CHKPKG.tar.gz && ! -e $CHKPKG.tar.gz.asc ]]; then echo " No tarball or .asc file found." | tee -a $TMPLOG fi while :; do diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt index b296b19..30956c2 100644 --- a/tools/ChangeLog-latest.txt +++ b/tools/ChangeLog-latest.txt @@ -1,5 +1,9 @@ SBOPKG NEWS +sbopkg-dev (2016-08-30 23:14:21 UTC) + MODIFICATIONS + * Do not use wildcard for GPG checking (Fix #19) + sbopkg-0.38.0 (2016-07-01 16:52:27 UTC) FEATURES * Add --no-group to rsync so files are owned by root:root