summaryrefslogtreecommitdiff
path: root/common_functions
diff options
context:
space:
mode:
authorLudwig Nussel <ludwig.nussel@suse.de>2009-12-10 16:41:33 +0100
committerLudwig Nussel <ludwig.nussel@suse.de>2009-12-10 16:55:47 +0100
commit3c0262af98b641fca571a29d9889ae67cbf74c0b (patch)
tree1b27bbe67ee8447ce1d5cd8f7b13c7121f5267d3 /common_functions
parentb8c54ae10240b9cec3a4398ead4e4a107d23e246 (diff)
downloadbuild-3c0262af98b641fca571a29d9889ae67cbf74c0b.tar.gz
build-3c0262af98b641fca571a29d9889ae67cbf74c0b.tar.bz2
build-3c0262af98b641fca571a29d9889ae67cbf74c0b.zip
fix for set -e
Diffstat (limited to 'common_functions')
-rw-r--r--common_functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/common_functions b/common_functions
index 6f0fe9c..8a67511 100644
--- a/common_functions
+++ b/common_functions
@@ -18,9 +18,9 @@ set_build_arch()
if test "$BUILD_ARCH" != "${BUILD_ARCH#i686}" ; then
cpuflags=`grep ^flags /proc/cpuinfo`
cpuflags="$cpuflags "
- test "$cpuflags" = "${cpuflags/ cx8 /}" -o "$cpuflags" = "${cpuflags/ cmov /}" && {
+ if test "$cpuflags" = "${cpuflags/ cx8 /}" -o "$cpuflags" = "${cpuflags/ cmov /}"; then
echo "Your cpu doesn't support i686 rpms. Exit."
- exit 1
- }
+ cleanup_and_exit 1
+ fi
fi
}