From a18ac2fbbf8d215c698180016dd5f3bffa674760 Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 25 Mar 2009 15:00:38 +0000 Subject: [PATCH] update --- scripts/all-builds.py | 11 +++++------ scripts/all-builds.sh | 4 ++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/all-builds.py b/scripts/all-builds.py index 3f501b5..656045c 100755 --- a/scripts/all-builds.py +++ b/scripts/all-builds.py @@ -1,5 +1,5 @@ #!/usr/bin/python -subversion_id = "$Id: module-tools.py 12136 2009-02-20 14:11:56Z thierry $" +subversion_id = "$Id$" from optparse import OptionParser @@ -92,12 +92,11 @@ def build_build_option (branch,tag): else: return ' -s ' + URL + "/build/branches/%(branch)s"%locals() -def build_tags_option (branch): +def build_tags_option (branch,locals_dict): try: - return MAJOR_HASH[branch]['tags']%locals() + return MAJOR_HASH[branch]['tags']%locals_dict except: - return ' -s ' + URL + "/build/branches/%(branch)s"%locals() - + return '---------- could not set up tags option ----------' #################### def optparse_list (option, opt, value, parser): @@ -145,7 +144,6 @@ Examples: for build in args: (branch,tag) = parse_branch (build) build_option=build_build_option(branch,tag) - tags_option = build_tags_option(branch) print '#################### build',build, if tag: print 'tag',tag @@ -164,6 +162,7 @@ Examples: base=options.base for pldistro in pldistros: + tags_option = build_tags_option(branch,locals()) for fcdistro in fcdistros: for bit in options.bits: p="linux"+bit diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh index d6479e6..0305dac 100755 --- a/scripts/all-builds.sh +++ b/scripts/all-builds.sh @@ -8,6 +8,10 @@ COMMAND=$(basename $0) MAILTO="-m build@onelab.eu" +echo $COMMAND is deprecated, use all-builds.py instead +exit 1 + + function usage () { echo "Usage: $COMMAND [options [ -- vbuild-nightly-options ]]" echo "In manual mode you should export the following vars (or use related option)" -- 2.47.0