summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_comp/files
diff options
context:
space:
mode:
authorsborrill <sborrill@pkgsrc.org>2008-10-10 15:56:31 +0000
committersborrill <sborrill@pkgsrc.org>2008-10-10 15:56:31 +0000
commit6f1eaa64f01d375f415547bf15a4500ea39ce987 (patch)
tree2056bbb601c974a2d49d6ac43063fbcabae67c13 /pkgtools/pkg_comp/files
parent5c46d1eeaaa6164174662c0c49da4bcfc4099e2b (diff)
downloadpkgsrc-6f1eaa64f01d375f415547bf15a4500ea39ce987.tar.gz
Version 1.31 - make chroot target return its exit status
Diffstat (limited to 'pkgtools/pkg_comp/files')
-rw-r--r--pkgtools/pkg_comp/files/pkg_comp.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 6cd95638951..64da9dfc8e8 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.sh
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pkg_comp.sh,v 1.33 2007/10/27 17:11:24 seb Exp $
+# $NetBSD: pkg_comp.sh,v 1.34 2008/10/10 15:56:31 sborrill Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
# Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -838,7 +838,7 @@ EOF
#
pkg_chroot()
{
- local prefix script
+ local prefix script exitstatus
[ -d $DESTDIR ] || err "$DESTDIR does not exist"
@@ -861,9 +861,11 @@ EOF
fi
chmod +x $script
ENV=/etc/shrc chroot $DESTDIR /pkg_comp/tmp/`basename $script`
+ exitstatus=$?
echo
rm $script
fsumount
+ return $exitstatus
}
# ----------------------------------------------------------------------
@@ -1007,7 +1009,7 @@ case "$target" in
readconf
checkroot
pkg_chroot $args
- exit 0
+ exit $?
;;
removeroot)
readconf