diff --git a/ChangeLog b/ChangeLog index ed54b51..fa476eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,10 +5,6 @@ Changes in version 1.14.2 Execute 'notify.disable_colors()' when 'colorize' is set to '0' (disabled) to ignore color redefinitions made by user. -+ improvement - * plugins/* - Davide Madrisan: - Do not load a library already loaded by another autospec module. - + update * autospec - Davide Madrisan: Send the debug message showing autospec version as soon as possible. diff --git a/lib/libapse.lib.in b/lib/libapse.lib.in index 1806b52..f611294 100644 --- a/lib/libapse.lib.in +++ b/lib/libapse.lib.in @@ -3,9 +3,6 @@ # Copyright (C) 2007,2012 Stefano Cotta Ramusino # Copyright (C) 2008-2011 Silvan Calarco -[ "$libapse_is_loaded" = 1 ] || { -libapse_is_loaded=1 - [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 @@ -593,5 +590,3 @@ a newer version of \`${NOTE}$specname${NORM}' is already installed" return $retval } - -} # endif $libapse_is_loaded diff --git a/lib/libcfg.lib.in b/lib/libcfg.lib.in index e7aa657..c19662d 100644 --- a/lib/libcfg.lib.in +++ b/lib/libcfg.lib.in @@ -2,9 +2,6 @@ # libcfg.lib -- @package@ library for loading the configuration file(s) # Copyright (C) 2008,2011,2012 Davide Madrisan -[ "$libcfg_is_loaded" = 1 ] || { -libcfg_is_loaded=1 - [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 @@ -116,5 +113,3 @@ done [ "$cfg_files_num" = 0 ] && notify.error $"configuration file not found" unset cfg_file - -} # endif $libcfg_is_loaded diff --git a/lib/libmsgmng.lib.in b/lib/libmsgmng.lib.in index 623f723..1b6b0fe 100644 --- a/lib/libmsgmng.lib.in +++ b/lib/libmsgmng.lib.in @@ -2,9 +2,6 @@ # libmsgmng.lib -- @package@ library to manage debug/warning/error messages # Copyright (C) 2005,2006,2008,2012 Davide Madrisan -[ "$libmsgmng_is_loaded" = 1 ] || { -libmsgmng_is_loaded=1 - [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 @@ -73,5 +70,3 @@ $"unknown color theme \`$colorize_theme': colors will be disabled" function notify.disable_colors() { ESC= CRIT= NOTE= WARN= EXIT= NORM= } - -} # endif $libmsgmng_is_loaded diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in index c5983b1..eddb093 100644 --- a/lib/libnetwork.lib.in +++ b/lib/libnetwork.lib.in @@ -2,9 +2,6 @@ # libnetwork.lib -- @package@ library to get info from internet repositories # Copyright (C) 2008,2010,2012 Davide Madrisan -[ "$libnetwork_is_loaded" = 1 ] || { -libnetwork_is_loaded=1 - [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && { echo $"this script requires bash version 3 or better" >&2 && exit 1; } @@ -1065,5 +1062,3 @@ an error occurred while creating"": ${pck_tarball}.tar.bz2" return 0 } - -} # endif $libnetwork_is_loaded diff --git a/lib/libspec.lib.in b/lib/libspec.lib.in index 8bd31a9..365bd42 100644 --- a/lib/libspec.lib.in +++ b/lib/libspec.lib.in @@ -2,9 +2,6 @@ # libspec.lib -- @package@ library to manage rpm specfiles # Copyright (C) 2004-2010,2012 Davide Madrisan -[ "$libspec_is_loaded" = 1 ] || { -libspec_is_loaded=1 - [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 @@ -1247,5 +1244,3 @@ function getversionfromtarball() { notify.debug "$FUNCNAME: pck_version = \"$pck_version\"" echo "$pck_version" } - -} # endif $libspec_is_loaded diff --git a/lib/libtest.lib.in b/lib/libtest.lib.in index 13e2cb0..befaeec 100644 --- a/lib/libtest.lib.in +++ b/lib/libtest.lib.in @@ -2,9 +2,6 @@ # libtest.lib -- @package@ library used by the test framework # Copyright (C) 2012 Davide Madrisan -[ "$libtest_is_loaded" = 1 ] || { -libtest_is_loaded=1 - [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && { echo $"this script requires bash version 3 or better" >&2 && exit 1; } @@ -173,5 +170,3 @@ function test.runall() { --tmpdir "$tmpextractdir" done } - -} # endif $libtest_is_loaded