If a ChangeLog exists then append it to relnotes

This commit is contained in:
Tom G. Christensen 2009-10-10 09:58:32 +00:00
parent 24e3551aba
commit 2f1bc2aea6
2 changed files with 27 additions and 0 deletions

View File

@ -1115,6 +1115,19 @@ auto_rel()
-e "s;%%ENVIRONMENT%%;${extracted_env};g" \ -e "s;%%ENVIRONMENT%%;${extracted_env};g" \
-e "s;%%DEPENDENCIES%%;${deps};g" \ -e "s;%%DEPENDENCIES%%;${deps};g" \
${rn} > "$relmetadir/${topdir}.txt" ${rn} > "$relmetadir/${topdir}.txt"
# Add a ChangeLog if it exists
if [ -r $metadir/ChangeLog ]; then
echo "auto_rel: Adding ChangeLog to relnotes"
# See if we can find an entry for this build otherwise complain
if [ -z "${__grep} ${version}-${pkgver}$" ]; then
echo "autorel: WARNING: Did not find ChangeLog entry for ${version}-${pkgver}!"
fi
echo >> "$relmetadir/${topdir}.txt"
cat $metadir/ChangeLog >> "$relmetadir/${topdir}.txt"
else
echo "auto_rel: WARNING: ChangeLog is missing!"
fi
} }
# auto_dir(): Make sure all necessary dir entries are in prototype # auto_dir(): Make sure all necessary dir entries are in prototype

View File

@ -426,6 +426,19 @@ auto_rel()
-e "s;%%DEPENDENCIES%%;${deps};g" \ -e "s;%%DEPENDENCIES%%;${deps};g" \
${rn} > "$relmetadir/${secname}.txt" ${rn} > "$relmetadir/${secname}.txt"
# Add a ChangeLog if it exists
if [ -r $metadir/ChangeLog ]; then
echo "auto_rel: Adding ChangeLog to relnotes"
# See if we can find an entry for this build otherwise complain
if [ -z "${__grep} ${version}-${pkgver}$" ]; then
echo "autorel: WARNING: Did not find ChangeLog entry for ${version}-${pkgver}!"
fi
echo >> "$relmetadir/${secname}.txt"
cat $metadir/ChangeLog >> "$relmetadir/${secname}.txt"
else
echo "auto_rel: WARNING: ChangeLog is missing!"
fi
### Add the relnotes to the prototype file ### Add the relnotes to the prototype file
add_dir $defaultperms $defaultuid $defaultgid "${metaprefix}relnotes" $secname add_dir $defaultperms $defaultuid $defaultgid "${metaprefix}relnotes" $secname
add_proto $defaultperms $defaultuid $defaultgid "${metaprefix}relnotes/$secname-$version-$pkgver" $secname add_proto $defaultperms $defaultuid $defaultgid "${metaprefix}relnotes/$secname-$version-$pkgver" $secname
@ -473,6 +486,7 @@ auto_dir()
if [ "$found" -eq 0 ]; then if [ "$found" -eq 0 ]; then
# No match, we must add an entry # No match, we must add an entry
ddirs="$(echo $ddirs $path_comp)" ddirs="$(echo $ddirs $path_comp)"
### FIXME defaultperms, defaultuid and defaultgid as essentially uninitialized here!
add_dir $defaultperms $defaultuid $defaultgid "$path_comp" $secname # Add dir entry add_dir $defaultperms $defaultuid $defaultgid "$path_comp" $secname # Add dir entry
echo "auto_dir: Adding $path_comp for $secname" echo "auto_dir: Adding $path_comp for $secname"
fi fi