diff options
author | Richard Purdie <richard@openedhand.com> | 2008-05-16 07:18:42 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-05-16 07:18:42 +0000 |
commit | 4c664f698ca1fe0d0e04f581d01d024757fdad8a (patch) | |
tree | 3df2e52036c1001ee4ce5b70428f3640f522715f | |
parent | 1cde6638f5be53edbf8e7eebc921f0f55d222e10 (diff) | |
download | poky-4c664f698ca1fe0d0e04f581d01d024757fdad8a.tar.gz |
packaged-staging.bbclass: Improve postamble exit code handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4484 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 41b348d1b3..5cee0621a5 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -268,9 +268,17 @@ populate_staging_postamble () { | |||
268 | # list the packages currently installed in staging | 268 | # list the packages currently installed in staging |
269 | # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list | 269 | # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list |
270 | 270 | ||
271 | # exitcode == 5 is ok, it means the files change | ||
271 | set +e | 272 | set +e |
272 | stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging | 273 | stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging |
274 | exitcode=$? | ||
275 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then | ||
276 | exit $exitcode | ||
277 | fi | ||
273 | stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross | 278 | stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross |
279 | if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then | ||
280 | exit $exitcode | ||
281 | fi | ||
274 | set -e | 282 | set -e |
275 | fi | 283 | fi |
276 | } | 284 | } |