From e8573de42f572df3dd7ed3e849523cba90a43403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marko=20Gr=C3=B6nroos?= Date: Fri, 7 Jan 2011 16:46:12 +0000 Subject: [PATCH] Get book repository URL from command-line as it is no longer stored in the core repo. svn changeset:16825/svn branch:6.5 --- build/bin/tagrelease.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/bin/tagrelease.py b/build/bin/tagrelease.py index ae8c7a9a65..40bc42a352 100755 --- a/build/bin/tagrelease.py +++ b/build/bin/tagrelease.py @@ -39,7 +39,7 @@ def readProperties(filename): def helpAndExit(): print "Usage: build/bin/tagrelease [parameters...]" print "Commands:" - print "\ttag " + print "\ttag " sys.exit(1) ############################################################################### @@ -74,7 +74,7 @@ def tag(product, srcUrl, trgUrl, version, changeset, dryrun = 1): ############################################################################### # Tag command ############################################################################### -def tagCommand(version, changeset): +def tagCommand(version, changeset, bookRepo): # Check parameters m = re.match(r'^[0-9]+\.[0-9]+\.[0-9]+(\.\w+)?$', version) if not m: @@ -92,8 +92,6 @@ def tagCommand(version, changeset): tagUrl = repoRoot+"/releases/"+version # Book tag parameters - versionProperties = readProperties("build/VERSION.properties") - bookRepo = versionProperties["manual.repository"] if not re.search(r'branches/[0-9\.]+$', bookRepo): print "Bad documentation branch '%s' for release." % (bookRepo) sys.exit(1) @@ -131,8 +129,8 @@ def verifyCommand(version, changeset): if len(sys.argv) < 2: helpAndExit() -if sys.argv[1] == "tag" and len(sys.argv) == 4: - tagCommand(sys.argv[2], sys.argv[3]) +if sys.argv[1] == "tag" and len(sys.argv) == 5: + tagCommand(sys.argv[2], sys.argv[3], sys.argv[4]) elif sys.argv[1] == "verify" and len(sys.argv) == 4: verifyCommand(sys.argv[2], sys.argv[3]) else: -- 2.39.5