[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Version 1.31 - make chroot target re...

[sborrill <sborrill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/33442efa6073
branches:  trunk
changeset: 548181:33442efa6073
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Fri Oct 10 15:56:31 2008 +0000

description:
Version 1.31 - make chroot target return its exit status

diffstat:

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

diffs (53 lines):

diff -r c2c550d2ebb3 -r 33442efa6073 pkgtools/pkg_comp/Makefile
--- a/pkgtools/pkg_comp/Makefile        Fri Oct 10 13:24:58 2008 +0000
+++ b/pkgtools/pkg_comp/Makefile        Fri Oct 10 15:56:31 2008 +0000
@@ -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 -r c2c550d2ebb3 -r 33442efa6073 pkgtools/pkg_comp/files/pkg_comp.sh
--- a/pkgtools/pkg_comp/files/pkg_comp.sh       Fri Oct 10 13:24:58 2008 +0000
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh       Fri Oct 10 15:56:31 2008 +0000
@@ -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@localhost>
@@ -838,7 +838,7 @@
 #
 pkg_chroot()
 {
-    local prefix script
+    local prefix script exitstatus
 
     [ -d $DESTDIR ] || err "$DESTDIR does not exist"
 
@@ -861,9 +861,11 @@
     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 @@
         readconf
         checkroot
         pkg_chroot $args
-        exit 0
+        exit $?
         ;;
     removeroot)
         readconf