Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-16 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove SKIP_EMPTY.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Willy Sudiarto Raharjo 2017-06-19 18:16:01 +07:00
parent 23696b383b
commit ba15355444
No known key found for this signature in database
GPG key ID: 887B8374D7333381
4 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/usr/libexec/sbopkg/sqg/functions
View file

@ -240,11 +240,11 @@ execute_build () {
printf '%s\n' "${PKGSNEW[@]}" | \
parallel --eta --will-cite --jobs $JOBS \
/usr/libexec/sbopkg/sqg/sqg-build-queuefile \
"$REPO_DIR" "$QUEUEDIR" {} "$SKIP_EMPTY" "$VERBOSE"
"$REPO_DIR" "$QUEUEDIR" {} "$VERBOSE"
else
for PKG in "${PKGSNEW[@]}"; do
/usr/libexec/sbopkg/sqg/sqg-build-queuefile \
"$REPO_DIR" "$QUEUEDIR" "$PKG" "$SKIP_EMPTY" "$VERBOSE"
"$REPO_DIR" "$QUEUEDIR" "$PKG" "$VERBOSE"
done
fi

14
src/usr/libexec/sbopkg/sqg/sqg-build-queuefile
View file

@ -6,24 +6,16 @@
REPO_DIR="$1"
QUEUEDIR="$2"
INFO="$3"
SKIP_EMPTY="${4:-}"
VERBOSE="${5:-no}"
CUSTOM_QUEUE="${6:-}"
VERBOSE="${4:-no}"
CUSTOM_QUEUE="${5:-}"
. $INFO
if [ "$VERBOSE" == "yes" ]; then
INFO_BASENAME=$(basename $INFO .info)
if [[ -z $REQUIRES && $SKIP_EMPTY == "yes" ]]; then
echo "$INFO_BASENAME: No dep(s) defined for this package."
echo "No queuefile generated."
echo "Uncomment SKIP_EMPTY variable in sqg to change this behavior."
fi
echo "Processing $INFO_BASENAME."
fi
if [[ ! -z $REQUIRES || $SKIP_EMPTY == "no" ]]; then
if [[ ! -z $REQUIRES ]]; then
build_queuefile "$REPO_DIR" "$QUEUEDIR" "$PRGNAM" "$CUSTOM_QUEUE"
fi

14
src/usr/sbin/sqg
View file

@ -31,20 +31,6 @@
SBOPKG_CONF=${SBOPKG_CONF:-/etc/sbopkg/sbopkg.conf}
# If necessary, override SBOPKG_CONF above or directly from the environment.
# The user may want to change QUEUEDIR to a local temporary directory in $HOME
# since queuefiles in QUEUEDIR will be overwritten by this script. QUEUEDIR
# is commented out on purpose to get the user to review these variables.
# QUEUEDIR must be writable by the user executing the script. SKIP_EMPTY
# means the script will not create queuefiles for packages with an empty
# REQUIRES= line in the .info file. Uncomment or export a value to create
# queuefiles for packages with an empty REQUIRES= line (which will only
# contain the package name in the queuefile since there are no REQUIRES).
#QUEUEDIR=${QUEUEDIR:-/var/lib/sbopkg/queues}
REPO_BRANCH=${REPO_BRANCH:-$(cat /etc/slackware-version | awk '{print $2}')}
SKIP_EMPTY=${SKIP_EMPTY:-yes}
### NO CHANGES SHOULD BE NECESSARY BELOW THIS LINE ###
# source all sqg functions

1
tools/ChangeLog-latest.txt
View file

@ -23,6 +23,7 @@ sbopkg-dev (2017-06-18 01:40:00 UTC)
* use exit 1 when rsync failed instead of 0
* Fix 90-SBo-master.repo to accomodate SBo's new server
Patch by Matteo Bernardini
* Remove SKIP_EMPTY option.
sbopkg 0.38.1 (2016-09-01 13:42 UTC)
FEATURES