common Makefile.common,1.4,1.5 cvs-import.sh,1.5,1.6

[Elliot Lee (sopwith)]

Author: sopwith

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

Modified Files:
	Makefile.common cvs-import.sh 
Log Message:


Apply Makefile.common changes to have 
curl allow cached files, as per https://www.redhat.com/archives/fedora-extras-list/2005-February/msg00448.html

Apply Ville's cvs-import.sh patch to allow messages, http://home.arcor.de/ms2002sep/tmp/cvs-import.patch



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.common	24 Nov 2004 02:17:31 -0000	1.4
+++ Makefile.common	3 Mar 2005 20:02:52 -0000	1.5
@@ -63,7 +63,7 @@
 
 # We define CURL and WGET in a way that makes if possible to have them
 # overwritten from the module's Makefiles. Then CLIENT picks CURL, otherwise WGET
-CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -O -R -S --fail --show-error" ; fi)
+CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
 


Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cvs-import.sh	3 Feb 2005 00:30:33 -0000	1.5
+++ cvs-import.sh	3 Mar 2005 20:02:52 -0000	1.6
@@ -28,7 +28,7 @@
     cat <<EOF
 Usage:
 
-    $0 [-b <branch>] <package>
+    $0 [-b <branch>] [-m <message>] <package>
 
 Imports a package into the cvs repository. Will use the following defaults:
 CVSROOT    = $CVSROOT
@@ -42,6 +42,7 @@
 
 # Parse arguments
 BRANCH=
+MESSAGE=
 while [ -n "$1" ] ; do
     case "$1" in 
 	# import the package on the given branch. If the branch does
@@ -61,6 +62,11 @@
 	    fi
 	    ;;
 
+	-m | --message )
+	    shift
+	    MESSAGE="$1"
+	    ;;
+
 	# the always helpful help message
 	-h | --help )
 	    Usage
@@ -344,7 +350,8 @@
 echo "$LOG_ENTRY:$(date +%s)" >> ./import.log
 
 # prepare the commit message
-MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)"
+MESSAGE="auto-import $NAME-$VERSION-$RELEASE ${BRANCH:+on branch $BRANCH} from $(basename $PACKAGE)
+$MESSAGE"
 cvs -Q update && \
     echo "cvs commit..." && \
     cvs -Q commit -m "$MESSAGE" >/dev/null && echo "Commit Complete" && \