diff options
| -rwxr-xr-x | scripts/tatt | 2 | ||||
| -rw-r--r-- | tatt/dot-tatt-spec | 2 | ||||
| -rw-r--r-- | tatt/scriptwriter.py | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/scripts/tatt b/scripts/tatt index ca50cdb..3a66d18 100755 --- a/scripts/tatt +++ b/scripts/tatt @@ -174,7 +174,7 @@ if not packs==None: writeRdeps(jobname, packs, config) ## Config and Successscript can only be written if we have a bugnumber if options.bugnum: - writeSuccess(jobname, options.bugnum, config["successmessage"]) + writeSuccess(jobname, options.bugnum, config) writeCommit(jobname, options.bugnum, packs, config) exit (0) diff --git a/tatt/dot-tatt-spec b/tatt/dot-tatt-spec index 406c33c..1a0182e 100644 --- a/tatt/dot-tatt-spec +++ b/tatt/dot-tatt-spec @@ -1,5 +1,5 @@ atom-regexp=string(default="=?[^\s:,;<>]+/\S+-[0-9]?\S+[0-9][^\s:,;<>]?[a-z]*") -successmessage=string(default="Archtested on x86: Everything fine") +successmessage=string(default="Archtested on @@ARCH@@: Everything fine") ignoreprefix=string_list(default=list("elibc_","video_cards_","linguas_","kdeenablefinal","test","debug")) template-dir=string(default="/usr/share/tatt/templates/") unmaskfile=string(default="/etc/portage/package.keywords/archtest") diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py index d40811a..64cbcae 100644 --- a/tatt/scriptwriter.py +++ b/tatt/scriptwriter.py @@ -98,7 +98,7 @@ def writerdepscript(job, packlist, config): #######Write report script############ -def writesucessreportscript (job, bugnum, success): +def writesucessreportscript (job, bugnum, config): outfilename = (job + "-success.sh") reportname = (job + ".report") if os.path.isfile(outfilename): @@ -106,7 +106,8 @@ def writesucessreportscript (job, bugnum, success): outfile = open(outfilename,'w') outfile.write("#!/bin/sh" + '\n') outfile.write("if grep failed " + reportname + " >> /dev/null; then echo Failure found;\n") - outfile.write("else bugz modify " + bugnum + ' -c' + "\"" + success + "\";\n") + succmess = config['successmessage'].replace("@@ARCH@@", config['arch']) + outfile.write("else bugz modify " + bugnum + ' -c' + "\"" + succmess + "\";\n") outfile.write("fi;") outfile.close() print(("Success Report script written to " + outfilename)) |