From 664a27133c69f63bd62a3a150052ea02530f3f5b Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Fri, 3 Oct 2003 15:21:38 +0000 Subject: [PATCH] - 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 --- Doc/tools/mksourcepkg | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Doc/tools/mksourcepkg b/Doc/tools/mksourcepkg index 9dbb8dc720c..cad2b442b05 100755 --- a/Doc/tools/mksourcepkg +++ b/Doc/tools/mksourcepkg @@ -36,16 +36,17 @@ Doc = os.path.dirname(tools) patchlevel_tex = os.path.join(Doc, "commontex", "patchlevel.tex") quiet = 0 -rx = re.compile(r":ext:(?:[a-zA-Z0-9]+)@cvs\.([a-zA-Z0-9]+).sourceforge.net:" +rx = re.compile(r":ext:(?:[a-zA-Z0-9]+@)?cvs\.([a-zA-Z0-9]+).sourceforge.net:" r"/cvsroot/\1") def main(): global quiet + anonymous = False try: - opts, args = getopt.getopt(sys.argv[1:], "abgtzq", + opts, args = getopt.getopt(sys.argv[1:], "Aabgtzq", ["all", "bzip2", "gzip", "tools", "zip", - "quiet"]) + "quiet", "anonymous"]) except getopt.error, e: usage(warning=str(e)) sys.exit(2) @@ -69,6 +70,8 @@ def main(): formats["bzip2"] = 1 formats["gzip"] = 1 formats["zip"] = 1 + elif opt in ("-A", "--anonymous"): + anonymous = True if formats: # make order human-predictable formats = formats.keys() @@ -88,7 +91,7 @@ def main(): info = cvsinfo.RepositoryInfo(mydir) cvsroot = info.get_cvsroot() m = rx.match(cvsroot) - if m: + if m and anonymous: # If this is an authenticated SourceForge repository, convert to # anonymous usage for the export/checkout, since that avoids the # SSH overhead.