mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-10 03:50:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

show BUILD in prechecklog; change 'ERROR' to 'WARNING' when app is already in the queue; update for-next-release

Browse Source
This commit is contained in:
chess.griffin 2009-01-27 03:40:58 +00:00
parent 5c9513e4a6
commit 5a6df761a0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
for-next-release
View File

@ -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

6
src/usr/bin/sbopkg
View File

@ -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 <Yes> to replace or \
press <No> 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