conduit r1311 - in trunk: . scripts

[jstowers svn gnome org]

Author: jstowers
Date: Thu Feb 14 06:22:58 2008
New Revision: 1311
URL: http://svn.gnome.org/viewvc/conduit?rev=1311&view=rev

Log:
2008-02-14  John Stowers  <john stowers gmail com>

	* scripts/maintainer.py: Remove duplicate function
	* scripts/release.sh: Pass inferior arguments

2008-02-14  John Stowers  <john stowers gmail com>


Modified:
   trunk/ChangeLog
   trunk/scripts/maintainer.py
   trunk/scripts/release.sh

Modified: trunk/scripts/maintainer.py
==============================================================================
--- trunk/scripts/maintainer.py	(original)
+++ trunk/scripts/maintainer.py	Thu Feb 14 06:22:58 2008
@@ -982,13 +982,6 @@
 	print 'To continue, you must supply the --confirm option'
 	sys.exit()
 
-if opts.tag and not opts.confirm:
-	print 'This will create a new tag on your SVN repository!!'
-	print 'Are you sure you want to continue?'
-	print
-	print 'To continue, you must supply the --confirm option'
-	sys.exit()
-
 if opts.get_bugs:
         bugs = get_bugs(opts.revision)
 	if len(bugs) < 1:

Modified: trunk/scripts/release.sh
==============================================================================
--- trunk/scripts/release.sh	(original)
+++ trunk/scripts/release.sh	Thu Feb 14 06:22:58 2008
@@ -5,12 +5,11 @@
     exit 1
 fi
 
-#FIXME: Add version number command
 ./scripts/maintainer.py \
-    --debug \
     --revision=0.3.6 \
     --package-name=Conduit \
     --package-version=0.3.7 \
     --package-module=conduit \
     --release-note-template=scripts/release-template.txt \
-    --create-release-note
+    --create-release-note \
+    $*