common Makefile.common,1.44,1.45 cvs-import.sh,1.16,1.17

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30936

Modified Files:
	Makefile.common cvs-import.sh 
Log Message:
improve the error messages for no module and no branch



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.common	26 Mar 2007 12:25:26 -0000	1.44
+++ Makefile.common	2 Apr 2007 05:02:03 -0000	1.45
@@ -260,7 +260,8 @@
 
 # build for a particular arch
 $(ARCHES) : sources $(TARGETS)
-	$(RPM_WITH_DIRS) --target $@ -ba $(SPECFILE)
+	$(RPM_WITH_DIRS) --target $@ -ba $(SPECFILE) 2>&1 | tee .build-$(VERSION)-$(RELEASE).log
+	@exit ${PIPESTATUS[0]}
 
 # empty target to force checking of md5sums in FULLSOURCEFILES
 FORCE:


Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cvs-import.sh	2 Apr 2007 04:57:48 -0000	1.16
+++ cvs-import.sh	2 Apr 2007 05:02:03 -0000	1.17
@@ -167,12 +167,12 @@
 # Check out the existing module
 cd $TMPDIR
 echo "Checking out module: '$NAME'"
-$CVS -Q checkout $NAME || echo "\"$NAME\" module does not exist in cvs" && exit 1
+$CVS -Q checkout $NAME || echo "ERROR: \"$NAME\" module does not exist in cvs." && exit 1
 
 # this is our working directory
 cd $NAME
 
-[ -d ${BRANCH} ] || echo "\"$NAME/$BRANCH\" does not exist!" && exit 1
+[ -d ${BRANCH} ] || echo "ERROR: \"$NAME/$BRANCH\" does not exist!" && exit 1
 
 # check if we have imported this entry
 TAG=$(echo "${NAME##[0-9]}-$VERSION-$RELEASE" | sed -e 's/[$,.:;@]/_/g')