[Python-checkins] python/dist/src/Doc/tools mksourcepkg, 1.6, 1.6.16.1

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv6620

Modified Files:
      Tag: release23-maint
	mksourcepkg 
Log Message:
- don't re-write a SourceForge authenticated CVS root into the
  anonymous flavor unless the user asks for it on the command line
- decompose SourceForge authenticated CVS roots correctly


Index: mksourcepkg
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mksourcepkg,v
retrieving revision 1.6
retrieving revision 1.6.16.1
diff -C2 -d -r1.6 -r1.6.16.1
*** mksourcepkg	9 Aug 2002 20:20:50 -0000	1.6
--- mksourcepkg	3 Oct 2003 15:20:30 -0000	1.6.16.1
***************
*** 29,33 ****
  
  quiet = 0
! rx = re.compile(r":ext:(?:[a-zA-Z0-9]+)@cvs\.([a-zA-Z0-9]+).sourceforge.net:"
                  r"/cvsroot/\1")
  
--- 29,33 ----
  
  quiet = 0
! rx = re.compile(r":ext:(?:[a-zA-Z0-9]+@)?cvs\.([a-zA-Z0-9]+).sourceforge.net:"
                  r"/cvsroot/\1")
  
***************
*** 35,42 ****
  def main():
       global quiet
       try:
!           opts, args = getopt.getopt(sys.argv[1:], "abgtzq",
                                       ["all", "bzip2", "gzip", "tools", "zip",
!                                       "quiet"])
       except getopt.error, e:
            usage(warning=str(e))
--- 35,43 ----
  def main():
       global quiet
+      anonymous = False
       try:
!           opts, args = getopt.getopt(sys.argv[1:], "Aabgtzq",
                                       ["all", "bzip2", "gzip", "tools", "zip",
!                                       "quiet", "anonymous"])
       except getopt.error, e:
            usage(warning=str(e))
***************
*** 62,65 ****
--- 63,68 ----
                 formats["gzip"] = 1
                 formats["zip"] = 1
+           elif opt in ("-A", "--anonymous"):
+                anonymous = True
       if formats:
            # make order human-predictable
***************
*** 81,85 ****
       cvsroot = info.get_cvsroot()
       m = rx.match(cvsroot)
!      if m:
            # If this is an authenticated SourceForge repository, convert to
            # anonymous usage for the export/checkout, since that avoids the
--- 84,88 ----
       cvsroot = info.get_cvsroot()
       m = rx.match(cvsroot)
!      if m and anonymous:
            # If this is an authenticated SourceForge repository, convert to
            # anonymous usage for the export/checkout, since that avoids the