Attachment 717690 Details for Bug 928847 – rlImportAll.patch

[patch] rlImportAll.patch

rlImportAll.patch (text/plain), 1.27 KB, created by Dalibor Pospíšil on 2013-03-28 15:07:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dalibor Pospíšil

Created: 2013-03-28 15:07:10 UTC

Size: 1.27 KB

patch

obsolete

>diff -Nau /usr/share/beakerlib/libraries.sh.old /usr/share/beakerlib/libraries.sh.new
>--- /usr/share/beakerlib/libraries.sh.old	2013-03-28 14:03:05.875827258 +0100
>+++ /usr/share/beakerlib/libraries.sh.new	2013-03-28 14:00:54.445826983 +0100
>@@ -56,9 +56,9 @@
>     # 2) extract test(/Foo/Bar/Library/Baz) patterns
>     # 3) extract Bar/Baz from the patterns
>     # 4) make a single line of space-separated library IDs
>-    __INTERNAL_LIBRARY_DEPS="$(grep -E '^[^#]*RhtsRequires' Makefile \
>-     | grep -E -o 'test$/[^/)]+/[^/)]+/Library/[^/)]+$' \
>-     | sed -e 's|test(/[^/)]*/$[^/)]*$/Library/$[^/)]*$)|\1/\2|g' \
>+    __INTERNAL_LIBRARY_DEPS="$(grep -E '^[^#]*RhtsRequires' $MAKEFILE \
>+     | grep -E -o -e 'test$/[^/)]+/[^/)]+/Library/[^/)]+$' -e '[Ll]ibrary$[^)]*$' \
>+     | sed -e 's|test(/[^/)]*/$[^/)]*$/Library/$[^/)]*$)|\1/\2|g' -e 's|[Ll]ibrary($.*$)|\1|' \
>      | tr '\n' ' ')"
>   else
>     __INTERNAL_LIBRARY_DEPS=""
>@@ -228,8 +228,13 @@
>     rlLogError "rlImport: At least one argument needs to be provided"
>     return 1
>   fi
>-
>+  
>   local WORKLIST="$*"
>+  if [ "$1" == '--all' ]; then
>+    rlLogDebug "Try to import all libraries specified in Makefile"
>+    WORKLIST=$(__INTERNAL_extractRequires .)
>+  fi
>+
>   local PROCESSING="x"
> 
>   # Process all arguments

Actions: View | Diff

Attachments on bug 928847: 717690