Skip to content

E
etersoft-build-utils
Commit 72ee11d7 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

move add_changelog out of sources get cycle

parent ce0a2d68
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
bin/rpmgs
View file @ 72ee11d7
...@@ -214,10 +214,10 @@ do ...@@ -214,10 +214,10 @@ do
get_source $i "Source$nn" get_source $i "Source$nn"
test -z "$GETSOURCE" && { echog "Skip Source${nn} from $i" ; continue ; } test -z "$GETSOURCE" && { echog "Skip Source${nn} from $i" ; continue ; }
FTB=`basename $GETSOURCE` FTB=`basename $GETSOURCE`
build_rpms_name $i
[ -n "$FORCEDOWNLOAD" ] && rm -f "$RPMSOURCEDIR/$FTB" [ -n "$FORCEDOWNLOAD" ] && rm -f "$RPMSOURCEDIR/$FTB"
# was: test -f # was: test -f
bzip -t "$RPMSOURCEDIR/$FTB" && { echog "Tarball $FTB already exists in SOURCES dir, skipping." ; continue ; } bzip -t "$RPMSOURCEDIR/$FTB" && { echog "Tarball $FTB already exists in SOURCES dir, skipping." ; continue ; }
mkdir -p $RPMSOURCEDIR/ && pushd $RPMSOURCEDIR/ || fatal "Can't create/chdir..." mkdir -p $RPMSOURCEDIR/ && pushd $RPMSOURCEDIR/ || fatal "Can't create/chdir..."
echog "Try to load $GETSOURCE for $i" echog "Try to load $GETSOURCE for $i"
if [ -n "${GETSOURCE/*.bz2/}" ] ; then if [ -n "${GETSOURCE/*.bz2/}" ] ; then
...@@ -231,9 +231,12 @@ do ...@@ -231,9 +231,12 @@ do
fi fi
echo "DONE" echo "DONE"
popd popd
# VERSION we get after build_rpms_name
add_changelog_helper "- new version ($VERSION)" $i
done done
# Write changelog if all done
CURVER=$(get_version $i)
add_changelog_helper "- new version ($CURVER)" $i || echog "Changelog entry for $CURVER already exists"
done done
exit 0 exit 0
......
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