]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.bbclass: fix postinstall intercepts fallback
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Mon, 8 Apr 2013 15:06:40 +0000 (18:06 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 8 Apr 2013 15:55:52 +0000 (16:55 +0100)
The wrong type of paranthesis was used so 'continue' did nothing (was in
another context) and the packages were marked as installed.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image.bbclass

index 9721a6bd4837cebe6a1792ef7a09da746badbfe3..3cde0b8cba9b0528629a2aca140c7fd5dae17d89 100644 (file)
@@ -186,7 +186,7 @@ run_intercept_scriptlets () {
                        [ "$script" = "*" ] && break
                        [ "$script" = "postinst_intercept" ] || [ ! -x "$script" ] && continue
                        echo "> Executing $script"
-                       ./$script || (echo "WARNING: intercept script \"$script\" failed, falling back to running postinstalls at first boot" && continue)
+                       ./$script || { echo "WARNING: intercept script \"$script\" failed, falling back to running postinstalls at first boot" && continue; };
                        #
                        # If we got here, than the intercept was successful. Next, we must
                        # mark the postinstalls as "installed". For rpm is a little bit