[CMF-checkins] SVN: CMF/trunk/ - Some simplifications to the slurp_release release helper script and

[Jens Vagelpohl]

Log message for revision 37642:
  - Some simplifications to the slurp_release release helper script and
    updates to the RELEASE.txt release instructions.
  

Changed:
  U   CMF/trunk/CHANGES.txt
  U   CMF/trunk/RELEASE.txt
  U   CMF/trunk/slurp_release.py

-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt	2005-08-01 21:15:22 UTC (rev 37641)
+++ CMF/trunk/CHANGES.txt	2005-08-01 21:29:03 UTC (rev 37642)
@@ -59,6 +59,9 @@
 
   Others
 
+    - Some simplifications to the slurp_release release helper script and
+      updates to the RELEASE.txt release instructions.
+
     - The CMF now depends on Zope 2.8 / Five.
 
     - Non-release packages moved out of the /CMF/ repository package:

Modified: CMF/trunk/RELEASE.txt
===================================================================
--- CMF/trunk/RELEASE.txt	2005-08-01 21:15:22 UTC (rev 37641)
+++ CMF/trunk/RELEASE.txt	2005-08-01 21:29:03 UTC (rev 37642)
@@ -82,18 +82,15 @@
     picker widget.
 
     With Subversion and zope.org preparations done the 'slurp_release.py' 
-    script will do the remaining work. You run it with the Subversion tag 
-    and version ID as parameters::
+    script will do the remaining work. You run it with version ID 
+    (like '1.8.4-beta2') as parameter::
 
-      slurp_release.py [options] release_tag version_id
+      slurp_release.py [options] version_id
 
     slurp_release can be run from anywhere, it does not depend on your 
     Subversion sandbox because it will create its own. Without any options 
     it will complete the whole procedure including upload to the zope.org site. 
-    Use 'slurp_release.py --help' to find out more. The release_tag is equal 
-    to the Subversion tag in the repository (1.8.4-beta2, to stick with our 
-    example) whereas the version_id is the ID of the software release on 
-    zope.org (CMF-1.8.4-beta2).
+    Use 'slurp_release.py --help' to find out more.
 
     Once 'slurp_release.py' has completed the upload step you need to visit
     the uploaded files on zope.org and make sure they get published on the 

Modified: CMF/trunk/slurp_release.py
===================================================================
--- CMF/trunk/slurp_release.py	2005-08-01 21:15:22 UTC (rev 37641)
+++ CMF/trunk/slurp_release.py	2005-08-01 21:29:03 UTC (rev 37642)
@@ -100,7 +100,7 @@
         """ How are we used?
         """
         USAGE = """\
-slurp_release [options] release_tag version_id
+slurp_release [options] version_id
 
 options:
 
@@ -149,10 +149,11 @@
 
         self._command = command
 
-        if len( args ) != 2:
+        if len( args ) != 1:
             self._usage()
 
-        self._release_tag, self._version_id = args
+        self._release_tag = args[0]
+        self._version_id = 'CMF-%s' % self._release_tag
 
     def _runCommand( self ):