ports/64930: ports/Tools/portbuild/scripts/makeworld doesnt always return proper exit status

[Damir Kiramov]

>Number:         64930
>Category:       ports
>Synopsis:       ports/Tools/portbuild/scripts/makeworld doesnt always return proper exit status
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 30 01:50:25 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Damir Kiramov
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD www7.biblion.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Wed Feb 18 11:38:28 MSK 2004 root at www7.biblion.ru:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	makeworld always returns 0 even if buildworld/installworld failed
>How-To-Repeat:
	try using it on non-building world and examine returned status code
>Fix:


--- diff.makeworld begins here ---
--- ../i386/5/ports/Tools/portbuild/scripts/makeworld	Sat Sep 13 00:42:14 2003
+++ makeworld	Tue Mar 30 11:24:29 2004
@@ -57,7 +57,7 @@
 make buildworld $*
 error=$?
 if [ "$error" != "0" ]; then
-	exit $?
+	exit $error
 fi
 
 echo "==> Cleaning up chroot" 
@@ -71,7 +71,7 @@
 	make installworld DESTDIR=/var/chroot
 	error=$?
 	if [ "$error" != "0" ]; then
-		exit $?
+		exit $error
 	fi
 
 	echo "==> Starting make distribute"
@@ -81,7 +81,7 @@
 	make distribute DISTRIBUTION=/var/chroot/
 	error=$?
 	if [ "$error" != "0" ]; then
-		exit $?
+		exit $error
 	fi
 else
 	echo "==> Not doing installworld of client source tree"
--- diff.makeworld ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: