ports/178539: [PATCH] ports-mgmt/porttools: Improve commit sub-command

[TAKATSU Tomonari]

The following reply was made to PR ports/178539; it has been noted by GNATS.

From: TAKATSU Tomonari <tota at FreeBSD.org>
To: FreeBSD-gnats-submit at freebsd.org
Cc: joemann at beefree.free.de
Subject: ports/178539: [PATCH] ports-mgmt/porttools: Improve commit sub-command
Date: Mon, 13 May 2013 03:06:01 +0900 (JST)

 >Number:         178539
 >Category:       ports
 >Synopsis:       [PATCH] ports-mgmt/porttools: Improve commit sub-command
 >Confidential:   no
 >Severity:       non-critical
 >Priority:       low
 >Responsible:    freebsd-ports-bugs
 >State:          open
 >Quarter:        
 >Keywords:       
 >Date-Required:
 >Class:          change-request
 >Submitter-Id:   current-users
 >Arrival-Date:   Sun May 12 18:20:00 UTC 2013
 >Closed-Date:
 >Last-Modified:
 >Originator:     TAKATSU Tomonari
 >Release:        FreeBSD 8.2-RELEASE-p9 amd64
 >Organization:
 none (private)
 >Environment:
 System: FreeBSD photon.local.lan 8.2-RELEASE-p9 FreeBSD 8.2-RELEASE-p9 #0: Mon Jun 11 23:00:11 UTC 2012
 >Description:
 - Improve commit sub-command
  * Fix the conditional statement of checking the result of svn status
  * Make use of addport with -c option
  * Make use of svn commit with -F option
  * Cosmetic change
 
 Port maintainer (joemann at beefree.free.de) is cc'd.
 
 Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
 >How-To-Repeat:
 >Fix:
 
 --- porttools-0.99_8.patch begins here ---
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 317971)
 +++ Makefile	(working copy)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	porttools
  PORTVERSION=	0.99
 -PORTREVISION=	7
 +PORTREVISION=	8
  CATEGORIES=	ports-mgmt
  MASTER_SITES=	SF
  
 Index: files/patch-cmd_commit.in
 ===================================================================
 --- files/patch-cmd_commit.in	(revision 317971)
 +++ files/patch-cmd_commit.in	(working copy)
 @@ -1,5 +1,5 @@
  --- cmd_commit.in.orig	2009-09-10 04:59:59.000000000 +0900
 -+++ cmd_commit.in	2012-12-31 21:42:13.000000000 +0900
 ++++ cmd_commit.in	2013-04-27 07:26:46.000000000 +0900
  @@ -1,6 +1,6 @@
   # cmd_commit
   # Module for port(1)
 @@ -8,13 +8,16 @@
   #
   # $Id: cmd_commit.in,v 1.2 2009/09/09 19:58:30 skolobov Exp $
   #
 -@@ -59,13 +59,14 @@
 +@@ -59,13 +59,17 @@
   
   # Determine if this is a new port
   MODE="update"
  -[ "`grep '\$FreeBSD: ' Makefile`" ] || MODE="new"
  +svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'
 -+[ $? -eq 0 ] || [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE="new"
 ++if [ $? -eq 0 ]
 ++then
 ++	MODE="new"
 ++fi
   
   # Run portlint(1) to validate port's sanity
   echo "===> Pre-commit portlint check"
 @@ -25,13 +28,30 @@
   portlint ${FLAGS}
   if [ $? -ne 0 ]
   then
 -@@ -79,15 +80,12 @@
 +@@ -74,21 +78,25 @@
 + fi
 + 
 + 
 +-PORTSDIR="`make -V PORTSDIR`"
 ++# See if SVN message already exists, and use that for commit log
 ++MSG="svn-msg"
 ++FLAGS=""
 ++
 + if [ "${MODE}" = "new" ]
   then
 - 	${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME}
 - else
 +-	${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME}
 +-else
  -	# Initialize CVS environment
  -	PCVS="cvs -d ${FREEFALL_USERNAME}@pcvs.FreeBSD.org:/home/pcvs"
 --
 ++	PORTSDIR="`make -V PORTSDIR`"
 + 
 ++	if [ -e ${MSG} ]
 ++	then
 ++		FLAGS="-c ${MSG}"
 ++	fi
 ++
 ++	${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME} ${FLAGS}
 ++else
   	# Make sure we are working with up-to-date version
  -	echo "===> Pre-commit CVS update"
  -	${PCVS} update
 @@ -40,12 +60,11 @@
   
  -	# See if CVS message already exists, and use that for commit log
  -	MSG="cvs-msg"
 -+	# See if SVN message already exists, and use that for commit log
 -+	MSG="svn-msg"
 - 	FLAGS=""
 +-	FLAGS=""
   	if [ -e ${MSG} ]
   	then
 -@@ -99,16 +97,16 @@
 + 		FLAGS="-F ${MSG}"
 +@@ -99,18 +107,18 @@
   			echo '============================================='
   			cat ${MSG}
   			echo '============================================='
 @@ -61,7 +80,10 @@
  +	svn commit ${FLAGS}
   	
  -	# Remove CVS message file only if commit was successful
 -+	# Remove SVN message file only if commit was successful
 - 	[ $? -eq 0 -a -e ${MSG} ] && rm ${MSG}
 +-	[ $? -eq 0 -a -e ${MSG} ] && rm ${MSG}
   fi
 ++# Remove SVN message file only if commit was successful
 ++[ $? -eq 0 -a -e ${MSG} ] && rm ${MSG}
   
 + echo "===> Done"
 + exit 0
 --- porttools-0.99_8.patch ends here ---
 
 >Release-Note:
 >Audit-Trail:
 >Unformatted:
 _______________________________________________
 freebsd-ports-bugs at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
 To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe at freebsd.org"