Attachment 730730 Details for Bug 928857 – compatibility with bash-3.x

[patch] compatibility with bash-3.x

03-bash-3.x-compat.patch (text/plain), 3.33 KB, created by Dalibor Pospíšil on 2013-04-02 12:15:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dalibor Pospíšil

Created: 2013-04-02 12:15:57 UTC

Size: 3.33 KB

patch

obsolete

>diff -Nau /usr/share/beakerlib/libraries.sh.old /usr/share/beakerlib/libraries.sh
>--- /usr/share/beakerlib/libraries.sh.old	2013-04-02 14:01:40.241769141 +0200
>+++ /usr/share/beakerlib/libraries.sh	2013-04-02 14:08:27.749768938 +0200
>@@ -41,9 +41,6 @@
> 
> =cut
> 
>-declare -A __INTERNAL_LIBRARY_LOCATIONS
>-declare -A __INTERNAL_LIBRARY_IMPORTS
>-
> # Extract a list of required libraries from a Makefile
> # Takes a directory where the library is placed
> 
>@@ -253,20 +250,23 @@
> 
>     LIBS_TO_LOAD="$LIBS_TO_LOAD $PROCESSING"
> 
>+    # Extract two identifiers from an 'component/library' argument
>+    local COMPONENT=$( echo $PROCESSING | cut -d '/' -f 1 )
>+    local LIBRARY=$( echo $PROCESSING | cut -d '/' -f 2 )
>+
>+    local LOCATIONS_varname="__INTERNAL_LIBRARY_LOCATIONS_C${COMPONENT}_L${LIBRARY}"
>+    local IMPORTS_varname="__INTERNAL_LIBRARY_IMPORTS_C${COMPONENT}_L${LIBRARY}"
>+
>     # If the lib was already processed, do nothing
>-    if [ -n "${__INTERNAL_LIBRARY_IMPORTS[$PROCESSING]}" ]
>+    if [ -n "${!IMPORTS_varname}" ]
>     then
>       continue
>     fi
> 
>-    # Extract two identifiers from an 'component/library' argument
>-    local COMPONENT=$( echo $PROCESSING | cut -d '/' -f 1 )
>-    local LIBRARY=$( echo $PROCESSING | cut -d '/' -f 2 )
>-
>     if [ -z "$COMPONENT" ] || [ -z "$LIBRARY" ] || [ "$COMPONENT/$LIBRARY" != "$PROCESSING" ]
>     then
>       rlLogError "rlImport: Malformed argument [$PROCESSING]"
>-      __INTERNAL_LIBRARY_IMPORTS[$PROCESSING]="FAIL"
>+      eval $IMPORTS_varname="FAIL"
>       RESULT=1
>       continue;
>     fi
>@@ -280,7 +280,7 @@
>     if [ -z "$LIBFILE" ]
>     then
>       rlLogError "rlImport: Could not find library $PROCESSING"
>-      __INTERNAL_LIBRARY_IMPORTS[$PROCESSING]="FAIL"
>+      eval $IMPORTS_varname="FAIL"
>       RESULT=1
>       continue;
>     else
>@@ -289,20 +289,24 @@
> 
>     rlLogDebug "rlImport: Collecting dependencies for library $COMPONENT/$LIBRARY"
>     local LIBDIR="$(dirname $LIBFILE)"
>-    __INTERNAL_LIBRARY_LOCATIONS[$COMPONENT/$LIBRARY]="$LIBDIR"
>+    eval $LOCATIONS_varname='$LIBDIR'
>     WORKLIST="$WORKLIST $(__INTERNAL_extractRequires $LIBDIR )"
>-    __INTERNAL_LIBRARY_IMPORTS[$COMPONENT/$LIBRARY]="LOC"
>+    eval $IMPORTS_varname="LOC"
>   done
> 
>   local library
>   rlLogDebug "rlImport: LIBS_TO_LOAD='$LIBS_TO_LOAD'"
>   for library in $LIBS_TO_LOAD
>   do
>-    [ "${__INTERNAL_LIBRARY_IMPORTS[$library]}" != "LOC" ] && {
>+    local COMPONENT=$( echo $library | cut -d '/' -f 1 )
>+    local LIBRARY=$( echo $library | cut -d '/' -f 2 )
>+    local LOCATIONS_varname="__INTERNAL_LIBRARY_LOCATIONS_C${COMPONENT}_L${LIBRARY}"
>+    local IMPORTS_varname="__INTERNAL_LIBRARY_IMPORTS_C${COMPONENT}_L${LIBRARY}"
>+    [ "${!IMPORTS_varname}" != "LOC" ] && {
>       rlLogDebug "rlImport: skipping $library as it is already processed"
>       continue
>     }
>-    local LIBFILE="${__INTERNAL_LIBRARY_LOCATIONS[$library]}/lib.sh"
>+    local LIBFILE="${!LOCATIONS_varname}/lib.sh"
> 
>     # Try to extract a prefix comment from the file found
>     # Prefix comment looks like this:
>@@ -328,10 +332,10 @@
>     then
>       rlLogError "rlImport: Import of library $library was not successful (callback failed)"
>       RESULT=1
>-      __INTERNAL_LIBRARY_IMPORTS[$library]='FAIL'
>+      eval $IMPORTS_varname='FAIL'
>       continue;
>     fi
>-    __INTERNAL_LIBRARY_IMPORTS[$library]='PASS'
>+    eval $IMPORTS_varname='PASS'
>   done
> 
>   return $RESULT

Actions: View | Diff

Attachments on bug 928857: 730730