[oe-commits] Laurentiu Palcu : image.bbclass: fix postinstall intercepts fallback

git at git.openembedded.org git at git.openembedded.org
Mon Apr 8 15:54:27 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 0bdde53e885aae3506c7b070b6e21f64a7cd4115
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0bdde53e885aae3506c7b070b6e21f64a7cd4115

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Mon Apr  8 18:06:40 2013 +0300

image.bbclass: fix postinstall intercepts fallback

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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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





More information about the Openembedded-commits mailing list