pck-update: do not ignore the option '--changelog' when the variable 'changelog_userdef' is defined in one of the configuration files
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
parent
5774796d00
commit
13c66cf193
@ -19,6 +19,11 @@ Changes in version 1.16.0
|
||||
Add some variables to Makefiles.env and use them in the make targets
|
||||
'pot-files'.
|
||||
|
||||
+ bugfix
|
||||
* pck-update - Davide Madrisan:
|
||||
Do not ignore the option '--changelog' when the variable
|
||||
'changelog_userdef' is defined in one of the configuration files.
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Changes in version 1.14.3
|
||||
|
@ -237,7 +237,7 @@ while :; do
|
||||
ftp_server_upload_id="$2"
|
||||
shift ;;
|
||||
--changelog)
|
||||
changelog_userdef="$2"; shift ;;
|
||||
changelog_commandline="$2"; shift ;;
|
||||
--nosrpm)
|
||||
let "nosrpm = 1" ;;
|
||||
--norpm)
|
||||
@ -306,6 +306,8 @@ done
|
||||
notify.debug "${0} ${exec_options}"
|
||||
#echo -e "[ ${0} \\ \n ${exec_options} ]\n"
|
||||
|
||||
notify.debug "changelog_commandline = \"$changelog_commandline\""
|
||||
|
||||
if [ -n "$rpm_rootdir" ]; then
|
||||
[ -d "$rpm_rootdir" ] ||
|
||||
notify.error $"no such file or directory"": $rpm_rootdir"
|
||||
@ -1209,7 +1211,9 @@ s|\(.*[ \t]*${define_list_name[$i]}[ \t]*\).*|\1${define_list_value[$i]}|}" \
|
||||
|
||||
# set the changelog entry
|
||||
local changelog_new
|
||||
if [ "$changelog_userdef" ]; then
|
||||
if [ "$changelog_commandline" ]; then
|
||||
changelog_new="$changelog_commandline"
|
||||
elif [ "$changelog_userdef" ]; then
|
||||
changelog_new="$changelog_userdef"
|
||||
else
|
||||
if [ "$pck_newver" = "$SPEC_VERSION" ]; then
|
||||
@ -1221,6 +1225,7 @@ s|\(.*[ \t]*${define_list_name[$i]}[ \t]*\).*|\1${define_list_value[$i]}|}" \
|
||||
changelog_new="update to $pck_newver"
|
||||
fi
|
||||
fi
|
||||
notify.debug "changelog_new = \"$changelog_new\""
|
||||
|
||||
# NOTE: local specfile_newrelease="$(...)" does not work!
|
||||
local specfile_newrelease
|
||||
|
Loading…
Reference in New Issue
Block a user