# $Id$
# Exit codes:
# 0 - succesful
-# 1 - help dispayed
+# 1 - help displayed
# 2 - no spec file name in cmdl parameters
# 3 - spec file not stored in repo
# 4 - some source, patch or icon files not stored in repo
# 5 - package build failed
+# 6 - spec file with errors
+
+# Notes (todo):
+# - builder -u fetches current version first
+# - tries to get new version from distfiles without new md5
+# - after fetching new version doesn't update md5
+# - doesn't get sources for specs with %include /usr/lib/rpm/macros.python
+# when there's no rpm-pythonprov (rpm's fault, but it's ugly anyway)
+# - as above with %include /usr/lib/rpm/macros.perl and no rpm-perlprov
+# - when Icon: field is present, -5 and -a5 doesn't work
VERSION="\
Build package utility from PLD CVS repository
LOGDIROK=""
LOGDIRFAIL=""
LASTLOG_FILE=""
-LTAG=""
-CHMOD="yes"
+CHMOD="no"
CHMOD_MODE="0444"
RPMOPTS=""
BCOND=""
PACKAGE_RELEASE=""
PACKAGE_VERSION=""
PACKAGE_NAME=""
+PROTOCOL="ftp"
WGET_RETRIES=${MAX_WGET_RETRIES:-0}
CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
RES_FILE=""
CVS_SERVER="cvs.pld-linux.org"
-DISTFILES_SERVER="ftp://distfiles.pld-linux.org"
+DISTFILES_SERVER="://distfiles.pld-linux.org"
DEF_NICE_LEVEL=0
FAIL_IF_NO_SOURCES="yes"
-GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES --inet"
-GETURI2="wget -c -nd -t$WGET_RETRIES --inet"
+wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet"
+wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
+
+GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
+GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
GETLOCAL="cp -a"
if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
[-bb|--build-binary] [-bs|--build-source] [-u|--try-upgrade]
[{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>] [-g|--get]
- [-h|--help] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
+ [-h|--help] [--http] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
[-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T--tag <cvstag>]
[-Tvs|--tag-version-stable] [-Tvn|--tag-version-nest]
- [-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
+ [-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
+ [{-Tp|--tag-prefix} <prefix>]
[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>]
[--with/--without <feature>] [--define <macro> <value>] <package>[.spec]
-5, --update-md5
- - update md5 comments in spec, implies -nd
- -a5, --add-md5 - add md5 comments to URL sources, implies -nc -nd
+ - update md5 comments in spec, implies -nd -ncs
+ -a5, --add-md5 - add md5 comments to URL sources, implies -nc -nd -ncs
-D, --debug - enable script debugging mode,
-V, --version - output builder version
-a, --as_anon - get files via pserver as cvs@$CVS_SERVER,
- setup \$CVSROOT,
--define <macro> <value>
- define a macro <macro> with value <value>,
+ --nodeps - rpm won't check any dependences
-g, --get - get <package>.spec and all related files from
CVS repo or HTTP/FTP,
-h, --help - this message,
+ --http - use http instead of ftp,
-l <logfile>, --logtofile <logfile>
- log all to file,
-m, --mr-proper - only remove all files related to spec file and
- add cvs tag NEST for files,
-Tv, --tag-version
- add cvs tag NAME-VERSION-RELESE for files,
+ -Tp, --tag-prefix <prefix>
+ - add <prefix> to NAME-VERSION-RELEASE tags,
-v, --verbose - be verbose,
-u, --try-upgrade
- check version, and try to upgrade package
"
}
+cache_rpm_dump () {
+ rpm_dump_cache=`
+ case "$RPMBUILD" in
+ rpm )
+ rpm -bp --nodeps --define 'prep %dump' $BCOND $SPECFILE 2>&1
+ ;;
+ rpmbuild )
+ rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1
+ ;;
+ esac`
+}
+
+rpm_dump () {
+ if [ -z "$rpm_dump_cache" ] ; then
+ echo "internal error: cache_rpm_dump not called!" 1>&2
+ fi
+ echo "$rpm_dump_cache"
+}
+
parse_spec()
{
if [ -n "$DEBUG" ]; then
fi
cd $SPECS_DIR
+
+ cache_rpm_dump
+
if [ "$NOSRCS" != "yes" ]; then
- SOURCES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/SOURCEURL[0-9]+/ {print $3}'`"
+ SOURCES="`rpm_dump | awk '/SOURCEURL[0-9]+/ {print $3}'`"
fi
- if ($RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | grep -qEi ":.*nosource.*1"); then
+ if (rpm_dump | grep -qEi ":.*nosource.*1"); then
FAIL_IF_NO_SOURCES="no"
fi
- PATCHES="`$RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | awk '/PATCHURL[0-9]+/ {print $3}'`"
+ PATCHES="`rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}'`"
ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
PACKAGE_NAME="`$RPM -q --qf '%{NAME}\n' --specfile ${SPECFILE} 2> /dev/null | head -1`"
PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -1`"
Exit_error()
{
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
init_builder()
{
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
get_spec()
{
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
OPTIONS="$OPTIONS -A"
else
if [ -n "$CVSDATE" ]; then
- OPTIONS="$OPTIONS -D $CVSDATE"
+ OPTIONS="$OPTIONS -D $CVSDATE"
fi
if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
+ OPTIONS="$OPTIONS -r $CVSTAG"
fi
fi
result=$?
[ -n "$output" ] && echo "$output"
if [ "$result" -ne "0" ]; then
- if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
+ if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$retries_counter" -le "$CVS_RETRIES" ]; then
echo "Trying again [$SPECFILE]... ($retries_counter)"
sleep 2
continue
- fi
- Exit_error err_no_spec_in_repo;
+ fi
+ Exit_error err_no_spec_in_repo;
fi
done
fi
cd "$SPECS_DIR"
url="$1"
- if [ ! -f "mirrors" ] ; then
+ if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then
cvs update mirrors >&2
fi
src_no ()
{
cd $SPECS_DIR
- $RPMBUILD -bp $BCOND --define 'prep %dump' $SPECFILE 2>&1 | \
- grep "SOURCEURL[0-9]*[ ]*$1""[ ]*$" | \
- sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
- head -1 | xargs
+ rpm_dump | \
+ grep "SOURCEURL[0-9]*[ ]*$1""[ ]*$" | \
+ sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
+ head -1 | xargs
}
src_md5 ()
no=$(src_no "$1")
[ -z "$no" ] && return
cd $SPECS_DIR
- spec="$SPECFILE,$(head -1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
- md5=$(grep -v '^#' additional-md5sums | \
- grep -E "[ ]$(basename "$1")[ ]*[ ]${spec}([ ]|\$)" | \
- sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
- grep -E '^[0-9a-f]{32}$')
+ spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::)
+ if [ -z "$spec_rev" ]; then
+ spec_rev="$(head -1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
+ fi
+ spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')"
+ md5=$(grep -s -v '^#' additional-md5sums | \
+ grep -E "[ ]$(basename "$1")[ ]+${spec}([ ,]|\$)" | \
+ sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
+ grep -E '^[0-9a-f]{32}$')
if [ X"$md5" = X"" ] ; then
- grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs
+ grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs
else
- if [ $(echo "$md5" | wc -l) != 1 ] ; then
- echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
- fi
- echo "$md5" | tail -1
+ if [ $(echo "$md5" | wc -l) != 1 ] ; then
+ echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
+ fi
+ echo "$md5" | tail -1
fi
}
distfiles_url ()
{
- echo "$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+ echo "$PROTOCOL$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
}
good_md5 ()
GET_FILES="$@"
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
NOCVS="yes"
fi
fi
- if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -A"
- else
- if [ -n "$CVSDATE" ]; then
- OPTIONS="$OPTIONS -D $CVSDATE"
- fi
- if [ -n "$CVSTAG" ]; then
- OPTIONS="$OPTIONS -r $CVSTAG"
- fi
- fi
+ if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
+ OPTIONS="$OPTIONS -A"
+ else
+ if [ -n "$CVSDATE" ]; then
+ OPTIONS="$OPTIONS -D $CVSDATE"
+ fi
+ if [ -n "$CVSTAG" ]; then
+ OPTIONS="$OPTIONS -r $CVSTAG"
+ fi
+ fi
for i in $GET_FILES; do
+ if [ -n "$UPDATE5" ]; then
+ if [ -n "$ADD5" ]; then
+ [ `nourl $i` = "$i" ] && continue
+ grep -qiE '^#[ ]*Source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE && continue
+ else
+ grep -qiE '^#[ ]*Source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE || continue
+ fi
+ fi
+ FROM_DISTFILES=0
if [ ! -f `nourl $i` ] || [ $ALWAYS_CVSUP = "yes" ]; then
if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
echo "Warning: no URL given for $i"
fi
target=$(nourl "$i")
url=$(distfiles_url "$i")
- if [ `echo $url | grep -E '^(\.|/)'` ] ; then
+ if [ `echo $url | grep -E '^(\.|/)'` ]; then
${GETLOCAL} $url $target
else
- if [ -z "$NOMIRRORS" ] ; then
+ FROM_DISTFILES=1
+ if [ -z "$NOMIRRORS" ]; then
url="`find_mirror "$url"`"
fi
${GETURI} -O "$target" "$url" || \
if [ `echo $url | grep -E 'ftp://'` ]; then
${GETURI2} -O "$target" "$url"
fi
- test -s "$target" || rm -f "$target"
+ if ! test -s "$target"; then
+ rm -f "$target"
+ FROM_DISTFILES=0
+ fi
fi
- elif [ -z "$(src_md5 "$i")" ] && \
- ( [ -z "$NOCVS" ] || echo $i | grep -qvE '(ftp|http|https)://' ); then
+ elif [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ]; then
+ # ( echo $i | grep -qvE '(ftp|http|https)://' ); -- if CVS should be used, but URLs preferred
result=1
- retries_counter=0
- while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
- retries_counter=$(( $retries_counter + 1 ))
+ retries_counter=0
+ while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
+ retries_counter=$(( $retries_counter + 1 ))
output=$(LC_ALL=C cvs $OPTIONS `nourl $i` 2>&1)
- result=$?
+ result=$?
[ -n "$output" ] && echo "$output"
- if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
+ if (echo "$output" | grep -qE "(Cannot connect to|connect to .* failed|Connection reset by peer|Connection timed out|Unknown host)") && [ "$result" -ne "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; then
echo "Trying again [`nourl $i`]... ($retries_counter)"
sleep 2
continue
fi
if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
- if [ -z "$NOMIRRORS" ] ; then
- i="`find_mirror "$i"`"
+ if [ -z "$NOMIRRORS" ]; then
+ im="`find_mirror "$i"`"
+ else
+ im="$i"
fi
- ${GETURI} "$i" || \
- if [ `echo $i | grep -E 'ftp://'` ]; then ${GETURI2} "$i" ; fi
+ ${GETURI} "$im" || \
+ if [ `echo $im | grep -E 'ftp://'` ]; then ${GETURI2} "$im" ; fi
fi
- srcno=$(src_no $i)
- if [ ! -f "`nourl $i`" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
- Exit_error err_no_source_in_repo $i;
- elif [ -n "$UPDATE5" ] && \
- ( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \
- [ -z "$(grep -E -i '^NoSource[ ]*:[ ]*'$i'([ ]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \
- grep -q -i -E '^#[ ]*source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE )
- then
- echo "Updating source-$srcno md5."
- md5=$(md5sum `nourl $i` | cut -f1 -d' ')
- perl -i -ne 'print "# Source'$srcno'-md5:\t'$md5'\n"
- if /^Source'$srcno'\s*:\s+/;
- print unless /^\s*#\s*Source'$srcno'-md5\s*:/i' \
- $SPECS_DIR/$SPECFILE
- fi
-
- if good_md5 "$i"; then
- :
- else
- echo "MD5 sum mismatch. Use -U to refetch sources,"
- echo "or -5 to update md5 sums, if you're sure files are correct."
- Exit_error err_no_source_in_repo $i
- fi
+ fi
+ srcno=$(src_no $i)
+ if [ ! -f "`nourl $i`" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
+ Exit_error err_no_source_in_repo $i;
+ elif [ -n "$UPDATE5" ] && \
+ ( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \
+ [ -z "$(grep -E -i '^NoSource[ ]*:[ ]*'$i'([ ]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \
+ grep -q -i -E '^#[ ]*source'$(src_no $i)'-md5[ ]*:' $SPECS_DIR/$SPECFILE )
+ then
+ echo "Updating source-$srcno md5."
+ md5=$(md5sum `nourl $i` | cut -f1 -d' ')
+ perl -i -ne '
+ print unless /^\s*#\s*Source'$srcno'-md5\s*:/i;
+ print "# Source'$srcno'-md5:\t'$md5'\n"
+ if /^Source'$srcno'\s*:\s+/;
+ ' \
+ $SPECS_DIR/$SPECFILE
+ fi
+
+ if good_md5 "$i"; then
+ :
+ elif [ "$FROM_DISTFILES" = 1 ]; then
+ # wrong md5 from distfiles: remove the file and try again
+ # but only once ...
+ echo "MD5 sum mismatch. Trying full fetch."
+ FROM_DISTFILES=2
+ rm -f $target
+ ${GETURI} -O "$target" "$url" || \
+ if [ `echo $url | grep -E 'ftp://'` ]; then
+ ${GETURI2} -O "$target" "$url"
+ fi
+ test -s "$target" || rm -f "$target"
+ fi
+
+ if good_md5 "$i"; then
+ :
+ else
+ echo "MD5 sum mismatch. Use -U to refetch sources,"
+ echo "or -5 to update md5 sums, if you're sure files are correct."
+ Exit_error err_no_source_in_repo $i
fi
done
TAG_FILES="$@"
if [ -n "$DEBUG" ]; then
- set -x;
+ set -x;
set -v;
fi
if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
- echo $PACKAGE_VERSION
- echo $PACKAGE_RELEASE
- TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
+ echo "Version: $PACKAGE_VERSION"
+ echo "Release: $PACKAGE_RELEASE"
+ # Check whether first character of PACKAGE_NAME is legal for tag name
+ if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then
+ TAG_PREFIX=tag_
+ fi
+ TAGVER=$TAG_PREFIX$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
+ # Remove #kernel.version_release from TAGVER because tagging sources
+ # could occur with different kernel-headers than kernel-headers used at build time.
+ TAGVER=$(echo "$TAGVER" | sed -e 's/#.*//g')
if [ "$TAG_VERSION" = "yes" ]; then
echo "CVS tag: $TAGVER"
fi
cd $SOURCE_DIR
for i in $TAG_FILES; do
- if [ -f `nourl $i` ]; then
+ # don't tag non cvs files (ie. stored on distfiles)
+ [ "`nourl $i`" != "$i" ] && continue
+ if [ -f "`nourl $i`" ]; then
if [ "$TAG_VERSION" = "yes" ]; then
cvs $OPTIONS $TAGVER `nourl $i`
fi
if [ -n "$TRY_UPGRADE" ]; then
- if [ -n "FLOAT_VERSION" ]; then
+ if [ -n "$FLOAT_VERSION" ]; then
TNOTIFY=`./pldnotify.awk $SPECFILE -n`
else
TNOTIFY=`./pldnotify.awk $SPECFILE`
BUILD_SWITCH="-bs --nodeps" ;;
esac
if [ -n "$LOGFILE" ]; then
- if [ -n "$CVSTAG" ]; then
- LTAG="r_`echo $CVSTAG|sed -e 's/\./_/g'`_"
- else
- LTAG=""
- fi
LOG=`eval echo $LOGFILE`
if [ -n "$LASTLOG_FILE" ]; then
echo "LASTLOG=$LOG" > $LASTLOG_FILE
fi
RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
- (nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+ (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
RETVAL=`cat $RES_FILE`
rm $RES_FILE
if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
- if [ "$RETVAL" -eq "0" ]; then
+ if [ "$RETVAL" -eq "0" ]; then
mv $LOG $LOGDIROK
- else
- mv $LOG $LOGDIRFAIL
+ else
+ mv $LOG $LOGDIRFAIL
fi
fi
else
{
echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
}
+
#---------------------------------------------
# main()
-5 | --update-md5 )
COMMAND="get";
NODIST="yes"
+ NOCVSSPEC="yes"
UPDATE5="yes"
shift ;;
-a5 | --add-md5 )
COMMAND="get";
NODIST="yes"
NOCVS="yes"
+ NOCVSSPEC="yes"
UPDATE5="yes"
ADD5="yes"
shift ;;
COMMAND="get"; shift ;;
-h | --help )
COMMAND="usage"; shift ;;
+ --http )
+ PROTOCOL="http"; shift ;;
-l | --logtofile )
shift; LOGFILE="${1}"; shift ;;
-ni| --nice )
TAG=""
TAG_VERSION="yes"
shift;;
+ -Tp | --tag-prefix )
+ TAG_PREFIX="$2"
+ shift 2;;
-T | --tag )
COMMAND="tag";
shift
TAG_VERSION="no"
shift;;
-U | --update )
+ COMMAND="get"
UPDATE="yes"
+ NOCVSSPEC="yes"
NODIST="yes"
UPDATE5="yes"
- COMMAND="get"
shift ;;
-u | --try-upgrade )
TRY_UPGRADE="1"; shift ;;
shift 2
RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
;;
+ --nodeps)
+ shift
+ RPMOPTS="${RPMOPTS} --nodeps"
+ ;;
* )
SPECFILE="`basename ${1} .spec`.spec"; shift ;;
esac
fi
if [ -n "$ICONS" ]; then
- get_files $ICONS;
- parse_spec;
+ get_files $ICONS;
+ parse_spec;
fi
if [ -n "$NOSOURCE0" ] ; then
SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
fi
;;
"branch" )
- init_builder;
+ init_builder;
if [ -n "$SPECFILE" ]; then
get_spec;
parse_spec;
else
Exit_error err_no_spec_in_cmdl;
fi
- ;;
+ ;;
"get" )
init_builder;
if [ -n "$SPECFILE" ]; then
get_files $ICONS
parse_spec;
fi
+ # don't fetch sources from remote locations
+ new_SOURCES=""
+ for file in $SOURCES; do
+ [ "`nourl $file`" != "$file" ] && continue
+ new_SOURCES="$new_SOURCES $file"
+ done
+ SOURCES="$new_SOURCES"
get_files $SOURCES $PATCHES;
tag_files "$SOURCES $PATCHES $ICONS";
else