diff --git a/ChangeLog b/ChangeLog index b620bdc..42e4094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,15 @@ Changes in version 1.16.0 Set TEXTDOMAIN to "autospec-all" (point to the global translation file instead of using the partial ones). + * plugins/* - Davide Madrisan: + Do not load a library previously loaded by another module. + ++ bugfix + * plugins/* - Davide Madrisan: + Bug introduced in version 1.14.3. + Run 'notify.enable_colors' once the configuration files are loaded. + (Problem noticed by Silvan Calarco in 'pck-update'). + ------------------------------------------------------------------------------- Changes in version 1.14.3 diff --git a/plugins/pck-extract.in b/plugins/pck-extract.in index 1f71d8c..bff827f 100644 --- a/plugins/pck-extract.in +++ b/plugins/pck-extract.in @@ -140,11 +140,11 @@ for arg in $@; do notify.error $"unrecognized option"" -- \`$arg'" done -notify.enable_colors "$color_scheme" - notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\"" cfg_load_files "$custom_cfgfile_list" +notify.enable_colors "$color_scheme" + # s_rpm_pck : the name of the srpm package (local or remote) # (i.e. /usr/src/RPM/SRPMS/automake-1.9-1qilnx.src.rpm) # filelst : list of file to extract (default is '*.spec', that is the specfile) diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 504c543..16a5231 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -313,12 +313,12 @@ if [ -n "$rpm_rootdir" ]; then notify.error $"no such file or directory"": $rpm_rootdir" fi -[ "$logging" = "1" ] && color_scheme="none" -notify.enable_colors "$color_scheme" - notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\"" cfg_load_files "$custom_cfgfile_list" +[ "$logging" = "1" ] && color_scheme="none" +notify.enable_colors "$color_scheme" + # default values for non mandatory configuration variables [ "$logging_dir" ] || logging_dir="${tmppath_dir:-/var/tmp}/@package@" diff --git a/plugins/spec-create.in b/plugins/spec-create.in index 8b2ebba..d9cadd9 100644 --- a/plugins/spec-create.in +++ b/plugins/spec-create.in @@ -211,8 +211,6 @@ while :; do shift done -notify.enable_colors "$color_scheme" - for arg in $@; do notify.error $"unrecognized option"" -- \`$arg'" done @@ -220,6 +218,8 @@ done notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\"" cfg_load_files "$custom_cfgfile_list" +notify.enable_colors "$color_scheme" + function specfile.ckeck_defvalues() { # $1: name of the specfile local specfile="$1" currvalue