summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-08 18:06:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-08 16:56:46 +0100
commit51f8dffeccbe8f1bcce449d9188a1e12421e1be5 (patch)
tree1caa6595314787617b351c850663a64ba8cc2108 /meta
parenta808efccad3a5cbb0c01fbda72390b8c905927a1 (diff)
downloadpoky-51f8dffeccbe8f1bcce449d9188a1e12421e1be5.tar.gz
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. (From OE-Core rev: 0bdde53e885aae3506c7b070b6e21f64a7cd4115) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9721a6bd48..3cde0b8cba 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -186,7 +186,7 @@ run_intercept_scriptlets () {
186 [ "$script" = "*" ] && break 186 [ "$script" = "*" ] && break
187 [ "$script" = "postinst_intercept" ] || [ ! -x "$script" ] && continue 187 [ "$script" = "postinst_intercept" ] || [ ! -x "$script" ] && continue
188 echo "> Executing $script" 188 echo "> Executing $script"
189 ./$script || (echo "WARNING: intercept script \"$script\" failed, falling back to running postinstalls at first boot" && continue) 189 ./$script || { echo "WARNING: intercept script \"$script\" failed, falling back to running postinstalls at first boot" && continue; };
190 # 190 #
191 # If we got here, than the intercept was successful. Next, we must 191 # If we got here, than the intercept was successful. Next, we must
192 # mark the postinstalls as "installed". For rpm is a little bit 192 # mark the postinstalls as "installed". For rpm is a little bit