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

plugins: do not ignore the 'color_scheme' set in the configuration files

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-11-24 00:11:27 +01:00
parent 5a00359a29
commit 0e93767db4
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -33,6 +33,15 @@ Changes in version 1.16.0
Set TEXTDOMAIN to "autospec-all" (point to the global translation file Set TEXTDOMAIN to "autospec-all" (point to the global translation file
instead of using the partial ones). 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 Changes in version 1.14.3

4
plugins/pck-extract.in
View File

@ -140,11 +140,11 @@ for arg in $@; do
notify.error $"unrecognized option"" -- \`$arg'" notify.error $"unrecognized option"" -- \`$arg'"
done done
notify.enable_colors "$color_scheme"
notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\"" notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\""
cfg_load_files "$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) # s_rpm_pck : the name of the srpm package (local or remote)
# (i.e. /usr/src/RPM/SRPMS/automake-1.9-1qilnx.src.rpm) # (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) # filelst : list of file to extract (default is '*.spec', that is the specfile)

6
plugins/pck-update.in
View File

@ -313,12 +313,12 @@ if [ -n "$rpm_rootdir" ]; then
notify.error $"no such file or directory"": $rpm_rootdir" notify.error $"no such file or directory"": $rpm_rootdir"
fi fi
[ "$logging" = "1" ] && color_scheme="none"
notify.enable_colors "$color_scheme"
notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\"" notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\""
cfg_load_files "$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 # default values for non mandatory configuration variables
[ "$logging_dir" ] || logging_dir="${tmppath_dir:-/var/tmp}/@package@" [ "$logging_dir" ] || logging_dir="${tmppath_dir:-/var/tmp}/@package@"

4
plugins/spec-create.in
View File

@ -211,8 +211,6 @@ while :; do
shift shift
done done
notify.enable_colors "$color_scheme"
for arg in $@; do for arg in $@; do
notify.error $"unrecognized option"" -- \`$arg'" notify.error $"unrecognized option"" -- \`$arg'"
done done
@ -220,6 +218,8 @@ done
notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\"" notify.debug "custom_cfgfile_list = \"$custom_cfgfile_list\""
cfg_load_files "$custom_cfgfile_list" cfg_load_files "$custom_cfgfile_list"
notify.enable_colors "$color_scheme"
function specfile.ckeck_defvalues() { function specfile.ckeck_defvalues() {
# $1: name of the specfile # $1: name of the specfile
local specfile="$1" currvalue local specfile="$1" currvalue