openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pck-update: do not ignore the option '--changelog' when the variable 'changelog_userdef' is defined in one of the configuration files

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-11-20 22:34:57 +01:00
parent 5774796d00
commit 13c66cf193
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19,6 +19,11 @@ Changes in version 1.16.0
Add some variables to Makefiles.env and use them in the make targets Add some variables to Makefiles.env and use them in the make targets
'pot-files'. '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 Changes in version 1.14.3

9
plugins/pck-update.in
View File

@ -237,7 +237,7 @@ while :; do
ftp_server_upload_id="$2" ftp_server_upload_id="$2"
shift ;; shift ;;
--changelog) --changelog)
changelog_userdef="$2"; shift ;; changelog_commandline="$2"; shift ;;
--nosrpm) --nosrpm)
let "nosrpm = 1" ;; let "nosrpm = 1" ;;
--norpm) --norpm)
@ -306,6 +306,8 @@ done
notify.debug "${0} ${exec_options}" notify.debug "${0} ${exec_options}"
#echo -e "[ ${0} \\ \n ${exec_options} ]\n" #echo -e "[ ${0} \\ \n ${exec_options} ]\n"
notify.debug "changelog_commandline = \"$changelog_commandline\""
if [ -n "$rpm_rootdir" ]; then if [ -n "$rpm_rootdir" ]; then
[ -d "$rpm_rootdir" ] || [ -d "$rpm_rootdir" ] ||
notify.error $"no such file or directory"": $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 # set the changelog entry
local changelog_new local changelog_new
if [ "$changelog_userdef" ]; then if [ "$changelog_commandline" ]; then
changelog_new="$changelog_commandline"
elif [ "$changelog_userdef" ]; then
changelog_new="$changelog_userdef" changelog_new="$changelog_userdef"
else else
if [ "$pck_newver" = "$SPEC_VERSION" ]; then 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" changelog_new="update to $pck_newver"
fi fi
fi fi
notify.debug "changelog_new = \"$changelog_new\""
# NOTE: local specfile_newrelease="$(...)" does not work! # NOTE: local specfile_newrelease="$(...)" does not work!
local specfile_newrelease local specfile_newrelease