Patchwork [1/2] image.bbclass: fix postinstall intercepts fallback

login
register
mail settings
Submitter Laurentiu Palcu
Date April 8, 2013, 3:06 p.m.
Message ID <1365433601-24194-2-git-send-email-laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/47629/
State Accepted
Commit 0bdde53e885aae3506c7b070b6e21f64a7cd4115
Headers show

Comments

Laurentiu Palcu - April 8, 2013, 3:06 p.m.
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>
---
 meta/classes/image.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9721a6b..3cde0b8 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -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