Attachment 718172 Details for Bug 929348 – nested rlImport

[patch] nested rlImport

nestedImport.patch (text/plain), 2.14 KB, created by Dalibor Pospíšil on 2013-03-29 19:42:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dalibor Pospíšil

Created: 2013-03-29 19:42:52 UTC

Size: 2.14 KB

patch

obsolete

>diff -Nau /usr/share/beakerlib/libraries.sh.old /usr/share/beakerlib/libraries.sh
>--- /usr/share/beakerlib/libraries.sh.old	2013-03-29 20:33:42.734997190 +0100
>+++ /usr/share/beakerlib/libraries.sh	2013-03-29 20:24:35.259997167 +0100
>@@ -236,6 +236,7 @@
>   fi
> 
>   local PROCESSING="x"
>+  local LIBS_TO_LOAD=''
> 
>   # Process all arguments
>   while true
>@@ -250,6 +251,8 @@
>       break
>     fi
> 
>+    LIBS_TO_LOAD="$LIBS_TO_LOAD $PROCESSING"
>+
>     # If the lib was already processed, do nothing
>     if [ -n "${__INTERNAL_LIBRARY_IMPORTS[$PROCESSING]}" ]
>     then
>@@ -284,15 +287,21 @@
>       rlLogInfo "rlImport: Will try to import $COMPONENT/$LIBRARY from $LIBFILE"
>     fi
> 
>-    rlLogDebug "Collecting dependencies for library $COMPONENT/$LIBRARY"
>+    rlLogDebug "rlImport: Collecting dependencies for library $COMPONENT/$LIBRARY"
>     local LIBDIR="$(dirname $LIBFILE)"
>     __INTERNAL_LIBRARY_LOCATIONS[$COMPONENT/$LIBRARY]="$LIBDIR"
>     WORKLIST="$WORKLIST $(__INTERNAL_extractRequires $LIBDIR )"
>     __INTERNAL_LIBRARY_IMPORTS[$COMPONENT/$LIBRARY]="LOC"
>   done
> 
>-  for library in ${!__INTERNAL_LIBRARY_IMPORTS[@]}
>+  local library
>+  rlLogDebug "rlImport: LIBS_TO_LOAD='$LIBS_TO_LOAD'"
>+  for library in $LIBS_TO_LOAD
>   do
>+    [ "${__INTERNAL_LIBRARY_IMPORTS[$library]}" != "LOC" ] && {
>+      rlLogDebug "rlImport: skipping $library as it is already processed"
>+      continue
>+    }
>     local LIBFILE="${__INTERNAL_LIBRARY_LOCATIONS[$library]}/lib.sh"
> 
>     # Try to extract a prefix comment from the file found
>@@ -309,7 +318,7 @@
>     # Construct the validating function
>     # Its supposed to be called 'prefixLibraryLoaded'
>     local VERIFIER="${PREFIX}LibraryLoaded"
>-    rlLogDebug "Constructed verifier function: $VERIFIER"
>+    rlLogDebug "rlImport: Constructed verifier function: $VERIFIER"
> 
>     # Try to source the library
>     bash -n $LIBFILE && . $LIBFILE
>@@ -319,8 +328,10 @@
>     then
>       rlLogError "rlImport: Import of library $library was not successful (callback failed)"
>       RESULT=1
>+      __INTERNAL_LIBRARY_IMPORTS[$library]='FAIL'
>       continue;
>     fi
>+    __INTERNAL_LIBRARY_IMPORTS[$library]='PASS'
>   done
> 
>   return $RESULT

Actions: View | Diff

Attachments on bug 929348: 718172