From 6f1eaa64f01d375f415547bf15a4500ea39ce987 Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Fri, 10 Oct 2008 15:56:31 +0000
Subject: Version 1.31 - make chroot target return its exit status

---
 pkgtools/pkg_comp/Makefile          | 4 ++--
 pkgtools/pkg_comp/files/pkg_comp.sh | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgtools/pkg_comp')

diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 119c9c47c97..d3c92d9af64 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2008/06/16 13:19:57 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2008/10/10 15:56:31 sborrill Exp $
 
-DISTNAME=	pkg_comp-1.30
+DISTNAME=	pkg_comp-1.31
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
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
-- 
cgit v1.2.3