diff options
| author |   Rolf Eike Beer <eike@sf-mail.de> | 2020-05-02 12:32:37 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2020-05-02 12:48:43 +0200 |
| commit | a5f83728d12e841c67e9e264baa4d71d26aba0d4 (patch) | |
| tree | 4d56bc6eb26f2a3507b27a704c2abd9373da129d /tatt | |
| parent | man: fix example config file layout (diff) | |
| download | tatt-a5f83728d12e841c67e9e264baa4d71d26aba0d4.tar.gz tatt-a5f83728d12e841c67e9e264baa4d71d26aba0d4.tar.bz2 tatt-a5f83728d12e841c67e9e264baa4d71d26aba0d4.zip | |
remove unmaskfile config option, use unmaskdir instead
Write one unmask file per job, so cleanup can simply be rm.
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'tatt')
| -rw-r--r-- | tatt/dot-tatt-spec | 2 | ||||
| -rw-r--r-- | tatt/scriptwriter.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tatt/dot-tatt-spec b/tatt/dot-tatt-spec index 76a7039..1d9fe9d 100644 --- a/tatt/dot-tatt-spec +++ b/tatt/dot-tatt-spec @@ -1,7 +1,7 @@ successmessage=string(default="Archtested on @@ARCH@@: Everything fine") ignoreprefix=string_list(default=list("elibc_","video_cards_","linguas_","python_targets_","python_single_target_","kdeenablefinal","test","debug")) template-dir=string(default="/usr/share/tatt/templates/") -unmaskfile=string(default="/etc/portage/package.accept_keywords/archtest") +unmaskdir=string(default="/etc/portage/package.accept_keywords") arch=string(default="x86") defaultopts=string(default="") emergeopts=string(default="") diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py index b4bee69..c540626 100644 --- a/tatt/scriptwriter.py +++ b/tatt/scriptwriter.py @@ -41,7 +41,6 @@ def scriptTemplate(job, config, filename): snippet = snippet.replace("@@REPODIR@@", config['repodir']) snippet = snippet.replace("@@REPORTFILE@@", reportname) snippet = snippet.replace("@@BUILDLOGDIR@@", config['buildlogdir']) - snippet = snippet.replace("@@KEYWORDFILE@@", config['unmaskfile']) snippet = snippet.replace("@@NEWKEYWORD@@", newkeyword) snippet = snippet.replace("@@TEMPLATEDIR@@", config['template-dir']) return snippet @@ -214,8 +213,9 @@ def writecommitscript (job, config): ######## Write clean-up script ############## -def writeCleanUpScript (job, config): +def writeCleanUpScript (job, config, unmaskname): script = scriptTemplate(job, config, "cleanup") + script = script.replace("@@KEYWORDFILE@@", unmaskname) outfilename = (job.name + "-cleanup.sh") if os.path.isfile(outfilename): print("WARNING: Will overwrite " + outfilename) |