From 5a6df761a003cb5bec371e73f07bf55ae0305b24 Mon Sep 17 00:00:00 2001 From: "chess.griffin" Date: Tue, 27 Jan 2009 03:40:58 +0000 Subject: [PATCH] show BUILD in prechecklog; change 'ERROR' to 'WARNING' when app is already in the queue; update for-next-release --- for-next-release | 3 ++- src/usr/bin/sbopkg | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/for-next-release b/for-next-release index 9354d58..2c57c65 100644 --- a/for-next-release +++ b/for-next-release @@ -30,7 +30,8 @@ there is nothing in the temporarily-created download directory and tell user that download failed, and not offer to delete the source since there is no source. Along these lines, one user mentioned that when this happened, the item that failed the download was skipped when the user aborted the queue and -reran it. I could not reproduce this, but need to check it out. +reran it. I could not reproduce this, but need to check it out. SHOULD BE +DONE. Would it be helpful to have a way to run a queue through the update function? Suppose you have a saved queue with several deps and a final pkg, and some of those diff --git a/src/usr/bin/sbopkg b/src/usr/bin/sbopkg index 2205cc5..e91d138 100755 --- a/src/usr/bin/sbopkg +++ b/src/usr/bin/sbopkg @@ -1382,7 +1382,7 @@ add_item_to_queue () { ONOFF=$3 TMPQUEUE=$TMP/sbopkg-tmp-queue if $(cat $TMPQUEUE | grep -q "^$APP "); then - dialog --title "ERROR" --yesno "$(crunch "$APP is already in the \ + dialog --title "WARNING" --yesno "$(crunch "$APP is already in the \ queue. Do you want to replace it? Press to replace or \ press to skip.")" 10 50 if [ $? = 0 ]; then @@ -2021,6 +2021,8 @@ pick_slackbuild () { cp $PKGPATH/$PKG.SlackBuild.sbopkg $PKGPATH/$PKG.SlackBuild.build echo "Using local Slackbuild" >> $TMP/sbopkg_tmp_prechecklog fi + BUILD=$(egrep -m1 "^BUILD" $PKGPATH/$PKG.SlackBuild.build | + sed -e 's/^.*[=-]//;s/\"//;s/[ #}\t].*$//g;s/\"//g') } edit_local_info () { @@ -2238,7 +2240,7 @@ process_queue () { fi use_options $CHKBUILD echo $PKGNAME >> $FINALQUEUE - echo "Found $PKGNAME $VERSION" >> $PRECHECKLOG + echo "Found $PKGNAME $VERSION-$BUILD" >> $PRECHECKLOG if [ "$BUILDOPTIONS" = "" ]; then echo "Options: None" >> $PRECHECKLOG else