diff --git a/.gitignore b/.gitignore index e698ef3..fe1c9fe 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ beakerlib-1.3.tar.gz /beakerlib-1.7.tar.gz /beakerlib-1.8.tar.gz /beakerlib-1.9.tar.gz +/beakerlib-1.10.tar.gz diff --git a/0001-fixed-problem-with-IFS-other-that-space.patch b/0001-fixed-problem-with-IFS-other-that-space.patch deleted file mode 100644 index baeb31b..0000000 --- a/0001-fixed-problem-with-IFS-other-that-space.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e87f1d78661aeb04f1be7498e14f6dc74c0c83a1 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Wed, 18 Jun 2014 15:27:51 +0200 -Subject: [PATCH 01/14] fixed problem with IFS other that space - ---- - src/journal.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/journal.sh b/src/journal.sh -index ecd375c..346c5d0 100644 ---- a/src/journal.sh -+++ b/src/journal.sh -@@ -390,7 +390,7 @@ rljClosePhase(){ - } - - rljAddTest(){ -- if ! $__INTERNAL_JOURNALIST test --message "$1" --result "$2" ${3:+--command "$3"} -+ if ! eval "$__INTERNAL_JOURNALIST test --message \"\$1\" --result \"\$2\" ${3:+--command \"\$3\"}" - then - # Failed to add a test: there is no phase open - # So we open it, add a test, add a FAIL to let the user know --- -1.9.3 - diff --git a/0001-reverting-conditional-phases-support-except-for-comm.patch b/0001-reverting-conditional-phases-support-except-for-comm.patch deleted file mode 100644 index f85f5bc..0000000 --- a/0001-reverting-conditional-phases-support-except-for-comm.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 4284be292d6a409f83952702e0a4f0f8cdd8d637 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Thu, 17 Jul 2014 13:07:10 +0200 -Subject: [PATCH] reverting conditional phases support, except for common - handling of phase start - ---- - src/logging.sh | 64 ---------------------------------------------------------- - 1 file changed, 64 deletions(-) - -diff --git a/src/logging.sh b/src/logging.sh -index d831ac8..b01b102 100644 ---- a/src/logging.sh -+++ b/src/logging.sh -@@ -756,21 +756,6 @@ rlShowRunningKernel() { - } - - --__INTERNAL_conditional_phase_eval() { -- # check phases black-list -- [[ -n "$PHASES_BL" && "$1" =~ $PHASES_BL ]] && { -- rlLogWarning "Phase '$1' should be skipped as it is defined in \$PHASES_BL='$PHASES_BL'" -- return 2 -- } -- # always execute Setup, Cleanup and if no PHASES (white-list) specified -- [[ "$1" == "Setup" || "$1" == "Cleanup" || -z "$PHASES" ]] && return 0 -- [[ "$1" =~ $PHASES ]] && return 0 || { -- rlLogWarning "Phase '$1' should be skipped as it is not defined in \$PHASES='$PHASES'" -- return 1 -- } --} -- -- - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - # rlPhaseStart - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@@ -813,14 +798,10 @@ Optional name of the phase (if not provided, one will be generated). - - If all asserts included in the phase pass, phase reports PASS. - --Returns non-zero if something went wrong or if the phase is not supposed to be --executed (refer to B section) otherwise retun 0. -- - =cut - - rlPhaseStart() { - if [ "x$1" = "xFAIL" -o "x$1" = "xWARN" ] ; then -- __INTERNAL_conditional_phase_eval "$2" && \ - rljAddPhase "$1" "$2" - return $? - else -@@ -878,9 +859,6 @@ used. - - If you do not want these shortcuts, use plain C function. - --Returns non-zero if something went wrong or if the phase is not supposed to be --executed (refer to B section) otherwise retun 0. -- - =cut - - rlPhaseStartSetup() { -@@ -893,48 +871,6 @@ rlPhaseStartCleanup() { - rlPhaseStart "WARN" "${1:-Cleanup}" - } - --: <<'=cut' --=pod -- --=head2 Conditional phases -- --Each test phase can be conditionally skipped based on bash regular expression --given in PHASES_BL and/or PHASES variables. -- --=over -- --=item PHASES_BL -- --If match the phase name the respective phase should be skipped. -- --=item PHASES -- --If does B match the phase name the respective phase should be skipped --excluding 'Setup' and 'Cleanup' phases. -- --=back -- --Actual skipping has to be done in the test case itself by using return code of --functions I, I, I and --I. -- --Example: -- -- rlPhaseStartTest "bz123456" && { -- ... -- rlPhaseEnd; } -- --Evaluation of the phase relevancy works as follows: -- 1. If PHASES_BL is non-empty and matches phase name => return 2. -- 2. If phase name is 'Setup' or 'Cleanup' or PHASES is empty => return 0. -- 3. If PHASES is non-empty and matches phase name => return 0 otherwise return 1. -- --Normaly Setup and Cleanup phases are not skipped unless hey are B --black-listed. -- --=cut -- -- - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - # rlLogLowMetric - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- -1.9.3 - diff --git a/0002-fixed-issue-with-wrong-number-parameters-passed-to-b.patch b/0002-fixed-issue-with-wrong-number-parameters-passed-to-b.patch deleted file mode 100644 index 89f9b52..0000000 --- a/0002-fixed-issue-with-wrong-number-parameters-passed-to-b.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 32a0abbee3f5d4b0f167783c7e1b1cc9fce205e2 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Wed, 18 Jun 2014 15:58:58 +0200 -Subject: [PATCH 02/14] fixed issue with wrong number parameters passed to - bstor - ---- - src/storage.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/storage.sh b/src/storage.sh -index 820a8bb..156424b 100644 ---- a/src/storage.sh -+++ b/src/storage.sh -@@ -42,13 +42,13 @@ There are currently no public functions in this module - __INTERNAL_STORAGE_BIN=beakerlib-storage - - __INTERNAL_ST_GET() { -- $__INTERNAL_STORAGE_BIN get $@ -+ $__INTERNAL_STORAGE_BIN get "$@" - } - - __INTERNAL_ST_PUT() { -- $__INTERNAL_STORAGE_BIN put $@ -+ $__INTERNAL_STORAGE_BIN put "$@" - } - - __INTERNAL_ST_PRUNE() { -- $__INTERNAL_STORAGE_BIN prune $@ -+ $__INTERNAL_STORAGE_BIN prune "$@" - } --- -1.9.3 - diff --git a/0003-added-rlHash-and-rlUnhash-to-unify-hashing-in-variou.patch b/0003-added-rlHash-and-rlUnhash-to-unify-hashing-in-variou.patch deleted file mode 100644 index f2810a4..0000000 --- a/0003-added-rlHash-and-rlUnhash-to-unify-hashing-in-variou.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 3c1725d768874c069e78e792a4f538386acf5ab4 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Wed, 18 Jun 2014 18:05:46 +0200 -Subject: [PATCH 03/14] added rlHash and rlUnhash to unify hashing in various - places - ---- - src/infrastructure.sh | 91 ++++++++++++++++++++++++++++++++++++++++++++++++--- - src/libraries.sh | 8 ++--- - 2 files changed, 91 insertions(+), 8 deletions(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index cf434d5..8c8d7c7 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -332,6 +332,89 @@ rlAssertMount() { - } - - -+: <<'=cut' -+=pod -+ -+=head3 rlHash, rlUnhash -+ -+Hashes/Unhashes given string. -+ -+ rlHash [--decode] [--algorithm HASH_ALG] --stdin|STRING -+ rlUnhash [--algorithm HASH_ALG] --stdin|STRING -+ -+=over -+ -+=item --decode -+ -+Unhash given string. -+ -+=item --algorithm -+ -+Use given hash algorithm. -+Currently supported algorithms: -+ base64 -+ hex -+ -+Defaults to base64. -+Default algorithm can be override using global variable rlHashAlgorithm. -+ -+=item --stdin -+ -+Get the string from stdin. -+ -+=item STRING -+ -+String to be hashed/unhashed. -+ -+=back -+ -+Returns 0 if success. -+ -+=head4 Example with --clean: -+ -+ hash=rlHash "text" -+ -+=cut -+ -+rlHash() { -+ local GETOPT=$(getopt -q -o : -l decode,algorithm:,stdin -- "$@"); eval set -- "$GETOPT" -+ local decode=0 alg="$rlHashAlgorithm" stdin=0 -+ while true; do -+ case $1 in -+ --) shift; break ;; -+ --decode) decode=1 ;; -+ --algorithm) shift; alg="$1" ;; -+ --stdin) stdin=1 ;; -+ esac -+ shift -+ done -+ [[ "$alg" =~ ^(base64|hex)$ ]] || alg='base64' -+ local text="$1" command -+ -+ case $alg in -+ base64) -+ if [[ $decode -eq 0 ]]; then -+ command="base64 --wrap 0 | tr '=' '.'" -+ else -+ command="tr '.' '=' | base64 --decode" -+ fi -+ ;; -+ hex) -+ if [[ $decode -eq 0 ]]; then -+ command="od -A n -t x1 -v | tr -d ' \n\t'" -+ else -+ command="sed 's/\([0-9a-zA-Z]\{2\}\)/\\\x\1/g' | echo -en \"\$(cat -)\"" -+ fi -+ ;; -+ esac -+ -+ eval "( [[ \$stdin -eq 1 ]] && cat - || echo -n \"\$text\" ) | $command" -+} -+ -+rlUnhash() { -+ rlHash --decode "$@" -+} -+ - - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - # rlFileBackup -@@ -387,10 +470,10 @@ __INTERNAL_FILEBACKUP_NAMESPACE="rlFileBackupNamespace" - - __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - local path="$1" -- local path_encoded="$( echo $1 | base64 )" -+ local path_encoded="$( rlHash "$1" )" - - local namespace="$2" -- local namespace_encoded="$( echo $2 | base64 | tr "=" "." )" -+ local namespace_encoded="$( rlHash "$2" )" - - rlLogDebug "rlFileBackup: Setting up the cleaning lists" - rlLogDebug "rlFileBackup: Path [$path] Encoded [$path_encoded]" -@@ -408,7 +491,7 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - - __INTERNAL_FILEBACKUP_CLEAN_PATHS() { - local namespace="$1" -- local namespace_encoded="$( echo $1 | base64 | tr "=" "." )" -+ local namespace_encoded="$( rlHash "$1" )" - - rlLogDebug "rlFileRestore: Fetching clean-up lists for namespace: [$namespace] (encoded as [$namespace_encoded])" - -@@ -419,7 +502,7 @@ __INTERNAL_FILEBACKUP_CLEAN_PATHS() { - local path - for path in $PATHS - do -- local path_decoded="$( echo $path | base64 -d )" -+ local path_decoded="$( rlUnhash "$path" )" - if rm -rf "$path_decoded"; - then - rlLogDebug "rlFileRestore: Cleaning $path_decoded successful" -diff --git a/src/libraries.sh b/src/libraries.sh -index 7dfd736..667b3da 100644 ---- a/src/libraries.sh -+++ b/src/libraries.sh -@@ -271,8 +271,8 @@ rlImport() { - local COMPONENT=$( echo $PROCESSING | cut -d '/' -f 1 ) - local LIBRARY=$( echo $PROCESSING | cut -d '/' -f 2 ) - -- local COMPONENT_hash=$( echo -n "$COMPONENT" | od -A n -t x1 -v | tr -d ' \n\t' ) -- local LIBRARY_hash=$( echo -n "$LIBRARY" | od -A n -t x1 -v | tr -d ' \n\t' ) -+ local COMPONENT_hash=$( rlHash --algorithm hex "$COMPONENT" ) -+ local LIBRARY_hash=$( rlHash --algorithm hex "$LIBRARY" ) - local LOCATIONS_varname="__INTERNAL_LIBRARY_LOCATIONS_C${COMPONENT_hash}_L${LIBRARY_hash}" - local IMPORTS_varname="__INTERNAL_LIBRARY_IMPORTS_C${COMPONENT_hash}_L${LIBRARY_hash}" - -@@ -329,8 +329,8 @@ rlImport() { - do - local COMPONENT=$( echo $library | cut -d '/' -f 1 ) - local LIBRARY=$( echo $library | cut -d '/' -f 2 ) -- local COMPONENT_hash=$( echo -n "$COMPONENT" | od -A n -t x1 -v | tr -d ' \n\t' ) -- local LIBRARY_hash=$( echo -n "$LIBRARY" | od -A n -t x1 -v | tr -d ' \n\t' ) -+ local COMPONENT_hash=$( rlHash --algorithm hex "$COMPONENT" ) -+ local LIBRARY_hash=$( rlHash --algorithm hex "$LIBRARY" ) - local LOCATIONS_varname="__INTERNAL_LIBRARY_LOCATIONS_C${COMPONENT_hash}_L${LIBRARY_hash}" - local IMPORTS_varname="__INTERNAL_LIBRARY_IMPORTS_C${COMPONENT_hash}_L${LIBRARY_hash}" - [ "${!IMPORTS_varname}" != "LOC" ] && { --- -1.9.3 - diff --git a/0004-rlHash-added-base64_-algorithm-defaul-algorithm-chan.patch b/0004-rlHash-added-base64_-algorithm-defaul-algorithm-chan.patch deleted file mode 100644 index 7e790db..0000000 --- a/0004-rlHash-added-base64_-algorithm-defaul-algorithm-chan.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 63e3522f06c63cbbd3192ebe99c8d4bae3c859a0 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Thu, 19 Jun 2014 12:00:45 +0200 -Subject: [PATCH 04/14] rlHash: added base64_ algorithm, defaul algorithm - changed to hex - ---- - src/infrastructure.sh | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index 8c8d7c7..66643e3 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -353,9 +353,10 @@ Unhash given string. - Use given hash algorithm. - Currently supported algorithms: - base64 -+ base64_ - this is standard base64 where '=' is replaced by '_' - hex - --Defaults to base64. -+Defaults to hex. - Default algorithm can be override using global variable rlHashAlgorithm. - - =item --stdin -@@ -388,15 +389,22 @@ rlHash() { - esac - shift - done -- [[ "$alg" =~ ^(base64|hex)$ ]] || alg='base64' -+ [[ "$alg" =~ ^(base64|base64_|hex)$ ]] || alg='hex' - local text="$1" command - - case $alg in - base64) - if [[ $decode -eq 0 ]]; then -- command="base64 --wrap 0 | tr '=' '.'" -+ command="base64 --wrap 0" - else -- command="tr '.' '=' | base64 --decode" -+ command="base64 --decode" -+ fi -+ ;; -+ base64_) -+ if [[ $decode -eq 0 ]]; then -+ command="base64 --wrap 0 | tr '=' '_'" -+ else -+ command="tr '_' '=' | base64 --decode" - fi - ;; - hex) --- -1.9.3 - diff --git a/0005-rlHash-added-option-a-as-alias-to-algorithm.patch b/0005-rlHash-added-option-a-as-alias-to-algorithm.patch deleted file mode 100644 index 597ff1f..0000000 --- a/0005-rlHash-added-option-a-as-alias-to-algorithm.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c6581dea1d7b7667806a7f2a47208859443f29bf Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Thu, 19 Jun 2014 12:02:27 +0200 -Subject: [PATCH 05/14] rlHash: added option -a as alias to --algorithm - ---- - src/infrastructure.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index 66643e3..53d7c27 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -378,13 +378,13 @@ Returns 0 if success. - =cut - - rlHash() { -- local GETOPT=$(getopt -q -o : -l decode,algorithm:,stdin -- "$@"); eval set -- "$GETOPT" -+ local GETOPT=$(getopt -q -o a: -l decode,algorithm:,stdin -- "$@"); eval set -- "$GETOPT" - local decode=0 alg="$rlHashAlgorithm" stdin=0 - while true; do - case $1 in - --) shift; break ;; - --decode) decode=1 ;; -- --algorithm) shift; alg="$1" ;; -+ -a|--algorithm) shift; alg="$1" ;; - --stdin) stdin=1 ;; - esac - shift --- -1.9.3 - diff --git a/0006-__INTERNAL_FILEBACKUP_SET_PATH_CLEAN-__INTERNAL_FILE.patch b/0006-__INTERNAL_FILEBACKUP_SET_PATH_CLEAN-__INTERNAL_FILE.patch deleted file mode 100644 index 571f966..0000000 --- a/0006-__INTERNAL_FILEBACKUP_SET_PATH_CLEAN-__INTERNAL_FILE.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c548479c6d9d00e5e21c531e3c60668005602e62 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Thu, 19 Jun 2014 12:04:46 +0200 -Subject: [PATCH 06/14] __INTERNAL_FILEBACKUP_SET_PATH_CLEAN, - __INTERNAL_FILEBACKUP_CLEAN_PATHS: use hex hash instead of base64 - fixes - problems with case sensitivity - ---- - src/infrastructure.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index 53d7c27..9c1dfbb 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -478,10 +478,10 @@ __INTERNAL_FILEBACKUP_NAMESPACE="rlFileBackupNamespace" - - __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - local path="$1" -- local path_encoded="$( rlHash "$1" )" -+ local path_encoded="$( rlHash -a hex "$1" )" - - local namespace="$2" -- local namespace_encoded="$( rlHash "$2" )" -+ local namespace_encoded="$( rlHash -a hex "$2" )" - - rlLogDebug "rlFileBackup: Setting up the cleaning lists" - rlLogDebug "rlFileBackup: Path [$path] Encoded [$path_encoded]" -@@ -499,7 +499,7 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - - __INTERNAL_FILEBACKUP_CLEAN_PATHS() { - local namespace="$1" -- local namespace_encoded="$( rlHash "$1" )" -+ local namespace_encoded="$( rlHash -a hex "$1" )" - - rlLogDebug "rlFileRestore: Fetching clean-up lists for namespace: [$namespace] (encoded as [$namespace_encoded])" - -@@ -510,7 +510,7 @@ __INTERNAL_FILEBACKUP_CLEAN_PATHS() { - local path - for path in $PATHS - do -- local path_decoded="$( rlUnhash "$path" )" -+ local path_decoded="$( rlUnhash -a hex "$path" )" - if rm -rf "$path_decoded"; - then - rlLogDebug "rlFileRestore: Cleaning $path_decoded successful" --- -1.9.3 - diff --git a/0007-__INTERNAL_rlIsDistro-suppressed-output-of-expr-spee.patch b/0007-__INTERNAL_rlIsDistro-suppressed-output-of-expr-spee.patch deleted file mode 100644 index db781f5..0000000 --- a/0007-__INTERNAL_rlIsDistro-suppressed-output-of-expr-spee.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8c099d741e243e5daa09d1e1674675badc5f3bf3 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Thu, 19 Jun 2014 12:09:11 +0200 -Subject: [PATCH 07/14] __INTERNAL_rlIsDistro: suppressed output of expr, speed - optimization - ---- - src/testing.sh | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/src/testing.sh b/src/testing.sh -index afa7554..6c57bfc 100644 ---- a/src/testing.sh -+++ b/src/testing.sh -@@ -997,24 +997,23 @@ __INTERNAL_rlIsDistro(){ - echo $distro | grep -q "$1" || return 1 - shift - -- [ -z "$1" ] && return 0 -+ [[ -z "$1" ]] && return 0 - - local arg - for arg in "$@" - do - # sanity check - version needs to consist of numbers/dots/<=> -- expr match "$arg" '[<=>]*[0-9][0-9\.]*$' >/dev/null || return 1 -+ [[ "$arg" =~ ^([\<=\>]*)([0-9][0-9\.]*)$ ]] || return 1 - -- sign="$(echo $arg | grep -Eo '^[<=>]+')" -- if [ -z "$sign" ]; then -- if [ "$arg" == "$whole" ] || [ "$arg" == "$major" ] -+ sign="${BASH_REMATCH[1]}" -+ arg="${BASH_REMATCH[2]}" -+ if [[ -z "$sign" ]]; then -+ if [[ "$arg" == "$major" || "$arg" == "$whole" ]] - then - return 0 - fi - else -- # <=> match -- arg="$(echo $arg | sed -r 's/^[<=>]+//')" -- if expr index '.' $arg; then -+ if [[ "$arg" =~ \. ]]; then - __INTERNAL_test_version "$whole" "$sign" "$arg" - else - __INTERNAL_test_version "$major" "$sign" "$arg" --- -1.9.3 - diff --git a/0008-use-local-variable-instead-of-parameter.patch b/0008-use-local-variable-instead-of-parameter.patch deleted file mode 100644 index 286ae1a..0000000 --- a/0008-use-local-variable-instead-of-parameter.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3ea77a1e2b8af613e8dc57b8783b562a268d16d9 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Fri, 20 Jun 2014 09:53:27 +0200 -Subject: [PATCH 08/14] use local variable instead of parameter - ---- - src/infrastructure.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index 9c1dfbb..b821f10 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -478,10 +478,10 @@ __INTERNAL_FILEBACKUP_NAMESPACE="rlFileBackupNamespace" - - __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - local path="$1" -- local path_encoded="$( rlHash -a hex "$1" )" -+ local path_encoded="$( rlHash -a hex "$path" )" - - local namespace="$2" -- local namespace_encoded="$( rlHash -a hex "$2" )" -+ local namespace_encoded="$( rlHash -a hex "$namespace" )" - - rlLogDebug "rlFileBackup: Setting up the cleaning lists" - rlLogDebug "rlFileBackup: Path [$path] Encoded [$path_encoded]" -@@ -499,7 +499,7 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - - __INTERNAL_FILEBACKUP_CLEAN_PATHS() { - local namespace="$1" -- local namespace_encoded="$( rlHash -a hex "$1" )" -+ local namespace_encoded="$( rlHash -a hex "$namespace" )" - - rlLogDebug "rlFileRestore: Fetching clean-up lists for namespace: [$namespace] (encoded as [$namespace_encoded])" - --- -1.9.3 - diff --git a/0009-stored-namespace-key-cannot-be-empty.patch b/0009-stored-namespace-key-cannot-be-empty.patch deleted file mode 100644 index c23e4c0..0000000 --- a/0009-stored-namespace-key-cannot-be-empty.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e42f31656c381ca04ad9875bb9432b677c1486ba Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Fri, 20 Jun 2014 09:54:27 +0200 -Subject: [PATCH 09/14] stored namespace (key) cannot be empty - ---- - src/infrastructure.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index b821f10..ac2b990 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -480,7 +480,7 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - local path="$1" - local path_encoded="$( rlHash -a hex "$path" )" - -- local namespace="$2" -+ local namespace="_$2" - local namespace_encoded="$( rlHash -a hex "$namespace" )" - - rlLogDebug "rlFileBackup: Setting up the cleaning lists" -@@ -498,7 +498,7 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - } - - __INTERNAL_FILEBACKUP_CLEAN_PATHS() { -- local namespace="$1" -+ local namespace="_$1" - local namespace_encoded="$( rlHash -a hex "$namespace" )" - - rlLogDebug "rlFileRestore: Fetching clean-up lists for namespace: [$namespace] (encoded as [$namespace_encoded])" --- -1.9.3 - diff --git a/0010-rlGetMakefileRequires-fixed-space-at-the-end-and-pos.patch b/0010-rlGetMakefileRequires-fixed-space-at-the-end-and-pos.patch deleted file mode 100644 index 8b7058d..0000000 --- a/0010-rlGetMakefileRequires-fixed-space-at-the-end-and-pos.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 45352d826ae39f5e6a971b42edfa285012fde8ac Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Fri, 20 Jun 2014 15:41:07 +0200 -Subject: [PATCH 10/14] rlGetMakefileRequires: fixed space at the end and - possible other space issues - ---- - src/rpms.sh | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/rpms.sh b/src/rpms.sh -index 2b467dc..577b790 100644 ---- a/src/rpms.sh -+++ b/src/rpms.sh -@@ -367,7 +367,8 @@ rlAssertBinaryOrigin() { - - =head3 rlGetMakefileRequires - --Prints a list of requirements defined in Makefile using 'Requires' attribute. -+Prints comma separated list of requirements defined in Makefile using 'Requires' -+attribute. - - Return 0 if success. - -@@ -378,7 +379,7 @@ rlGetMakefileRequires() { - rlLogError "Could not find ./Makefile or the file is empty" - return 1 - } -- grep '"Requires:' Makefile | sed -e 's/.*Requires: *\(.*\)".*/\1/' | tr ' ' '\n' | sort | uniq | tr '\n' ' ' -+ grep '"Requires:' Makefile | sed -e 's/.*Requires: *\(.*\)".*/\1/' | tr ' ' '\n' | sort | uniq | tr '\n' ' ' | sed -r 's/^ +//;s/ +$//;s/ +/ /g' - return 0 - }; # end of rlGetMakefileRequires - --- -1.9.3 - diff --git a/0011-log-rpm-package-also-in-non-asserted-rpm-checks.patch b/0011-log-rpm-package-also-in-non-asserted-rpm-checks.patch deleted file mode 100644 index 3b9df8c..0000000 --- a/0011-log-rpm-package-also-in-non-asserted-rpm-checks.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4b18539c6e02753a1df3453d7cb082bc4608526c Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Fri, 20 Jun 2014 16:38:35 +0200 -Subject: [PATCH 11/14] log rpm package also in non asserted rpm checks - ---- - src/rpms.sh | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/rpms.sh b/src/rpms.sh -index 577b790..c9edd0c 100644 ---- a/src/rpms.sh -+++ b/src/rpms.sh -@@ -62,6 +62,9 @@ __INTERNAL_RpmPresent() { - [ "$release" == "" ] && package=$name-$version - [ "$version" == "" ] && package=$name - -+ export __INTERNAL_RPM_ASSERTED_PACKAGES="$__INTERNAL_RPM_ASSERTED_PACKAGES $name" -+ rljRpmLog "$name" -+ - if [ -n "$package" ]; then - rpm -q $package - local status=$? -@@ -199,8 +202,6 @@ rlAssertRpm() { - rlAssertRpm $package - done - else -- export __INTERNAL_RPM_ASSERTED_PACKAGES="$__INTERNAL_RPM_ASSERTED_PACKAGES $1" -- rljRpmLog "$1" - __INTERNAL_RpmPresent assert $1 $2 $3 $4 - fi - } --- -1.9.3 - diff --git a/0012-rlCheckRequirements-completely-supress-output-of-rlC.patch b/0012-rlCheckRequirements-completely-supress-output-of-rlC.patch deleted file mode 100644 index 30815cb..0000000 --- a/0012-rlCheckRequirements-completely-supress-output-of-rlC.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 97136d5fdd04c69a02fce862953df670e471c4c7 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Mon, 23 Jun 2014 02:35:06 +0200 -Subject: [PATCH 12/14] rlCheckRequirements: completely supress output of - rlCheckRpm - ---- - src/rpms.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rpms.sh b/src/rpms.sh -index c9edd0c..a2a96a4 100644 ---- a/src/rpms.sh -+++ b/src/rpms.sh -@@ -418,7 +418,7 @@ rlCheckRequirements() { - package="$(rpm -q "$req" 2> /dev/null)" - if [[ $? -eq 0 ]]; then - rlLog "requirement '$req' covered by package '$package'" -- rlCheckRpm "$package" > /dev/null -+ rlCheckRpm "$package" > /dev/null 2>&1 - else - binary="$(which "$req" 2> /dev/null)" - if [[ $? -eq 0 ]]; then --- -1.9.3 - diff --git a/0013-add-srpm-info-to-journal-bz1071693.patch b/0013-add-srpm-info-to-journal-bz1071693.patch deleted file mode 100644 index 3e9ed5b..0000000 --- a/0013-add-srpm-info-to-journal-bz1071693.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f396fa1f9a876ff6829afbd94278e29402f0ea36 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Tue, 1 Jul 2014 14:23:12 +0200 -Subject: [PATCH 13/14] add srpm info to journal, bz1071693 - ---- - src/python/journalling.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/python/journalling.py b/src/python/journalling.py -index 7a107a0..7ab824c 100755 ---- a/src/python/journalling.py -+++ b/src/python/journalling.py -@@ -328,6 +328,7 @@ class Journal(object): - - for pkg in mi: - pkgDetailsEl = xmldoc.createElement("pkgdetails") -+ pkgDetailsEl.setAttribute('sourcerpm', pkg['sourcerpm']) - pkgDetailsCon = xmldoc.createTextNode("%(name)s-%(version)s-%(release)s.%(arch)s " % pkg) - rpms.append((pkgDetailsEl, pkgDetailsCon)) - --- -1.9.3 - diff --git a/0014-supress-storage-data-in-non-debug-mode.patch b/0014-supress-storage-data-in-non-debug-mode.patch deleted file mode 100644 index 47c19ed..0000000 --- a/0014-supress-storage-data-in-non-debug-mode.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8c1773e0cbcd826a1f31e48ae57855c90df64396 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Tue, 1 Jul 2014 14:24:37 +0200 -Subject: [PATCH 14/14] supress storage data in non-debug mode - ---- - src/infrastructure.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index ac2b990..f57a2e4 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -491,10 +491,13 @@ __INTERNAL_FILEBACKUP_SET_PATH_CLEAN() { - if [ -z "$CURRENT" ] - then - __INTERNAL_ST_PUT --namespace="$__INTERNAL_FILEBACKUP_NAMESPACE" $namespace_encoded $path_encoded -- cat "$BEAKERLIB_DIR/storage/$__INTERNAL_FILEBACKUP_NAMESPACE" - else - __INTERNAL_ST_PUT --namespace="$__INTERNAL_FILEBACKUP_NAMESPACE" $namespace_encoded "$CURRENT $path_encoded" - fi -+ [[ -n "$DEBUG" ]] && { -+ rlLogDebug "stored data:" -+ cat "$BEAKERLIB_DIR/storage/$__INTERNAL_FILEBACKUP_NAMESPACE" -+ } - } - - __INTERNAL_FILEBACKUP_CLEAN_PATHS() { --- -1.9.3 - diff --git a/beakerlib.spec b/beakerlib.spec index 61b6eb0..a4e10a8 100644 --- a/beakerlib.spec +++ b/beakerlib.spec @@ -1,7 +1,7 @@ Name: beakerlib Summary: A shell-level integration testing library -Version: 1.9 -Release: 3%{?dist} +Version: 1.10 +Release: 1%{?dist} License: GPLv2 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -14,21 +14,6 @@ Requires: python2 Requires: grep Requires: sed BuildRequires: /usr/bin/pod2man -Patch0: 0001-fixed-problem-with-IFS-other-that-space.patch -Patch1: 0002-fixed-issue-with-wrong-number-parameters-passed-to-b.patch -Patch2: 0003-added-rlHash-and-rlUnhash-to-unify-hashing-in-variou.patch -Patch3: 0004-rlHash-added-base64_-algorithm-defaul-algorithm-chan.patch -Patch4: 0005-rlHash-added-option-a-as-alias-to-algorithm.patch -Patch5: 0006-__INTERNAL_FILEBACKUP_SET_PATH_CLEAN-__INTERNAL_FILE.patch -Patch6: 0007-__INTERNAL_rlIsDistro-suppressed-output-of-expr-spee.patch -Patch7: 0008-use-local-variable-instead-of-parameter.patch -Patch8: 0009-stored-namespace-key-cannot-be-empty.patch -Patch9: 0010-rlGetMakefileRequires-fixed-space-at-the-end-and-pos.patch -Patch10: 0011-log-rpm-package-also-in-non-asserted-rpm-checks.patch -Patch11: 0012-rlCheckRequirements-completely-supress-output-of-rlC.patch -Patch12: 0013-add-srpm-info-to-journal-bz1071693.patch -Patch13: 0014-supress-storage-data-in-non-debug-mode.patch -Patch14: 0001-reverting-conditional-phases-support-except-for-comm.patch %description @@ -48,21 +33,6 @@ Files for syntax highlighting BeakerLib tests in VIM editor %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 %build make build @@ -103,10 +73,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim %changelog -* Tue Jul 17 2014 Dalibor Pospisil - 1.9-3 +* Thu Nov 20 2014 Dalibor Pospisil - 1.10-1 +- dropped support for rlSEBoolean functions +- fixed bugs 554280, 1003433, 1103137, 1105299, 1124440, 1124454, 1131934, + 1131963, 1136206, 1155158, 1155234, 1158464, 1159191, and 1165265 + +* Thu Jul 17 2014 Dalibor Pospisil - 1.9-3 - reverted conditional phases support -* Tue Jul 1 2014 Dalibor Pospisil - 1.9-2 +* Wed Jul 1 2014 Dalibor Pospisil - 1.9-2 - bunch of fixes * Tue Jun 17 2014 Dalibor Pospisil - 1.9-1 diff --git a/configurable-docdir.patch b/configurable-docdir.patch deleted file mode 100644 index 46374c4..0000000 --- a/configurable-docdir.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 06cbdb009b82fcc362e3df1754c2cbb28f3e88c2 Mon Sep 17 00:00:00 2001 -From: Petr Muller -Date: Tue, 20 Aug 2013 17:24:02 +0200 -Subject: [PATCH] Squashed commit of the following: - -commit dd7d8a859df2b66e96d332d07cd9fb94186756b3 -Author: Petr Muller -Date: Tue Aug 20 17:12:03 2013 +0200 - - Fix new DOCDIR variable clash - -commit 9faa4cd93e3bcd621edcf48646b590fc68dbdc74 -Author: Petr Muller -Date: Tue Aug 20 16:25:22 2013 +0200 - - Make doc directory unversioned and configurable ---- - Makefile | 14 +++++++++----- - src/Makefile | 14 +++++++------- - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/Makefile b/Makefile -index c6c9f7f..1f13e86 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,6 +8,10 @@ ifndef DD - DD:=/ - endif - -+ifndef PKGDOCDIR -+ export PKGDOCDIR := /usr/share/doc/$(PKGNAME)/ -+endif -+ - export DESTDIR := $(shell readlink -f -n $(DD)) - - SUBDIRS := src -@@ -16,11 +20,11 @@ build: - for i in $(SUBDIRS); do $(MAKE) -C $$i; done - - install: -- mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/ -- install -m 644 -p LICENSE $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/ -- install -m 644 -p README $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/ -- install -m 644 -p MAINTENANCE $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/ -- install -m 644 -p VERSION $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/ -+ mkdir -p $(DESTDIR)$(PKGDOCDIR) -+ install -m 644 -p LICENSE $(DESTDIR)$(PKGDOCDIR) -+ install -m 644 -p README $(DESTDIR)$(PKGDOCDIR) -+ install -m 644 -p MAINTENANCE $(DESTDIR)$(PKGDOCDIR) -+ install -m 644 -p VERSION $(DESTDIR)$(PKGDOCDIR) - - for i in $(SUBDIRS); do $(MAKE) -C $$i install; done - -diff --git a/src/Makefile b/src/Makefile -index 2a98a7e..74748a2 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -46,14 +46,14 @@ install: - mkdir -p $(DESTDIR)/usr/share/beakerlib - mkdir -p $(DESTDIR)/usr/share/man/man1 - mkdir -p $(DESTDIR)/usr/bin -- mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/ -- mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/simple -- mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/phases -- mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/apache -+ mkdir -p $(DESTDIR)/$(PKGDOCDIR)/examples/ -+ mkdir -p $(DESTDIR)/$(PKGDOCDIR)/examples/simple -+ mkdir -p $(DESTDIR)/$(PKGDOCDIR)/examples/phases -+ mkdir -p $(DESTDIR)/$(PKGDOCDIR)/examples/apache - -- install -p -m 644 examples/simple/* $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/simple -- install -p -m 644 examples/phases/* $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/phases -- install -p -m 644 examples/apache/* $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/apache -+ install -p -m 644 examples/simple/* $(DESTDIR)/$(PKGDOCDIR)/examples/simple -+ install -p -m 644 examples/phases/* $(DESTDIR)/$(PKGDOCDIR)/examples/phases -+ install -p -m 644 examples/apache/* $(DESTDIR)/$(PKGDOCDIR)/examples/apache - - install -p -m 644 $(FILES) $(DESTDIR)/usr/share/beakerlib - install -p -m 644 dictionary.vim $(DESTDIR)/usr/share/beakerlib --- -1.8.3.1 - diff --git a/fix-pod-syntax.patch b/fix-pod-syntax.patch deleted file mode 100644 index 8cf27bd..0000000 --- a/fix-pod-syntax.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b041df8436aa5461978568a14b0bbbeabefcd772 Mon Sep 17 00:00:00 2001 -From: Petr Muller -Date: Thu, 9 May 2013 13:30:33 +0200 -Subject: [PATCH] Fix POD syntax - ---- - src/beakerlib.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/beakerlib.sh b/src/beakerlib.sh -index 3f15115..c3ee8aa 100644 ---- a/src/beakerlib.sh -+++ b/src/beakerlib.sh -@@ -260,6 +260,8 @@ Petr Splichal - - Ales Zelinka - -+=back -+ - =cut - - if set -o | grep posix | grep on ; then --- -1.8.2.1 - diff --git a/robust-distro-names.patch b/robust-distro-names.patch deleted file mode 100644 index 5932906..0000000 --- a/robust-distro-names.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 42851022001773130ef8c4ad57089811f47b85ba Mon Sep 17 00:00:00 2001 -From: Petr Muller -Date: Thu, 9 May 2013 13:05:46 +0200 -Subject: [PATCH] Robustify against non-ascii in distro release name - -Danke, Herr Schoedinger ---- - src/python/journalling.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/python/journalling.py b/src/python/journalling.py -index c86b9bd..3d62fd7 100755 ---- a/src/python/journalling.py -+++ b/src/python/journalling.py -@@ -352,7 +352,8 @@ class Journal(object): - release = release_file.read().strip() - except IOError: - release = "unknown" -- releaseCon = newdoc.createTextNode(release) -+ release = unicode(release, 'utf-8', errors='replace') -+ releaseCon = newdoc.createTextNode(release.translate(xmlTrans)) - - logEl = newdoc.createElement("log") - purposeEl = newdoc.createElement("purpose") --- -1.8.2.1 - diff --git a/sources b/sources index da804b4..c692355 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7405571fe5e8195325dfa889cd72a5c0 beakerlib-1.9.tar.gz +94276ab219a82ae98275cfb2ee928a97 beakerlib-1.10.tar.gz