Commit 87cd8135 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: do fatal error if we had no downloaded anything

parent 950f0efb
...@@ -347,6 +347,7 @@ do ...@@ -347,6 +347,7 @@ do
SOURCELIST=$(grep "^Source0\?:" $spec | sed -e "s|:.*||g") SOURCELIST=$(grep "^Source0\?:" $spec | sed -e "s|:.*||g")
fi fi
DOWNLOADSOME=''
for SN in $SOURCELIST for SN in $SOURCELIST
do do
GETSOURCE=$(eval_spec $spec | get_var "$SN") GETSOURCE=$(eval_spec $spec | get_var "$SN")
...@@ -384,6 +385,7 @@ do ...@@ -384,6 +385,7 @@ do
else else
echog "Try to load ${GETSOURCEURL} for $spec" echog "Try to load ${GETSOURCEURL} for $spec"
download_to "$GETSOURCEURL" "$FTB" || fatal "Can't download $GETSOURCEURL" download_to "$GETSOURCEURL" "$FTB" || fatal "Can't download $GETSOURCEURL"
DOWNLOADSOME=1
fi fi
else else
if ! rhas "$GETSOURCE" "ps?://" ; then if ! rhas "$GETSOURCE" "ps?://" ; then
...@@ -397,6 +399,7 @@ do ...@@ -397,6 +399,7 @@ do
fi fi
fi fi
download_any_tarball "$GETSOURCE" "$FTB" download_any_tarball "$GETSOURCE" "$FTB"
DOWNLOADSOME=1
# TODO: fix download single packed file # TODO: fix download single packed file
#else #else
# download_to "$GETSOURCE" "$FTB" # download_to "$GETSOURCE" "$FTB"
...@@ -413,6 +416,7 @@ do ...@@ -413,6 +416,7 @@ do
docmd git svn clone $GETSOURCESVN $(get_root_git_dir) docmd git svn clone $GETSOURCESVN $(get_root_git_dir)
echo "Run svn rebase from $GETSOURCESVN" echo "Run svn rebase from $GETSOURCESVN"
docmd git svn rebase docmd git svn rebase
DOWNLOADSOME=1
elif [ -n "${GETSOURCEGIT}" ] ; then elif [ -n "${GETSOURCEGIT}" ] ; then
echog "Try to fetch ${GETSOURCEGIT} for $spec" echog "Try to fetch ${GETSOURCEGIT} for $spec"
#TODO check upstream #TODO check upstream
...@@ -442,16 +446,20 @@ do ...@@ -442,16 +446,20 @@ do
#docmd gammit #docmd gammit
#docmd git commit -m "merge $FTB with rpmgs script" #docmd git commit -m "merge $FTB with rpmgs script"
DOWNLOADSOME=1
elif is_gear ; then elif is_gear ; then
commit_tarball "$FTB" commit_tarball "$FTB"
# TODO: make plugins # TODO: make plugins
update_gear_sources update_gear_sources
DOWNLOADSOME=1
fi fi
echog "DONE with $FTB" echog "DONE with $FTB"
done done
[ -n "$DOWNLOADSOME" ] || fatal "No upstream code is updated for nev version $GSSETVERSION."
if [ -z "$GSSKIPADDCHANGELOG" ] ; then if [ -z "$GSSKIPADDCHANGELOG" ] ; then
# Write changelog if all done # Write changelog if all done
CURVER=$(get_version $spec) CURVER=$(get_version $spec)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment