diff options
Diffstat (limited to 'tatt')
| -rw-r--r-- | tatt/dot-tatt-spec | 1 | ||||
| -rw-r--r-- | tatt/scriptwriter.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tatt/dot-tatt-spec b/tatt/dot-tatt-spec index ae7a989..59bc392 100644 --- a/tatt/dot-tatt-spec +++ b/tatt/dot-tatt-spec @@ -5,6 +5,7 @@ template-dir=string(default="/usr/share/tatt/templates/") unmaskfile=string(default="/etc/portage/package.keywords/archtest") arch=string(default="x86") defaultopts=string(default="") +emergeopts=string(default="") rdeps=integer(0,50,default=10) usecombis=integer(0,64,default=12) repodir=string(default="") diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py index 0aa0a4f..bf88aa6 100644 --- a/tatt/scriptwriter.py +++ b/tatt/scriptwriter.py @@ -19,13 +19,14 @@ def useCombiTestString(pack, config): s = "" # This will contain the resulting string usesnippet = usesnippetfile.read() usesnippet = usesnippet.replace("@@CPV@@", pack.packageString() ) + usesnippet = usesnippet.replace("@@EMERGEOPTS@@", config['emergeopts']) usecombis = findUseFlagCombis (pack, config) for uc in usecombis: localsnippet = usesnippet.replace("@@USE@@", uc) localsnippet = localsnippet.replace("@@FEATURES@@", "") s = s + localsnippet # In the end we test once with tests and users flags - localsnippet = usesnippet.replace("@@USE@@", " ") + localsnippet = usesnippet.replace("@@USE@@", "") localsnippet = localsnippet.replace("@@FEATURES@@", "FEATURES=\"${FEATURES} test\"") s = s + localsnippet return s @@ -65,6 +66,7 @@ def rdepTestString(rdep, config): ustring = ustring + " ".join(["-" + st[1:] for st in rdep[1] if st[0] == "!"]) + "\'" snip = snip.replace("@@USE@@", ustring) snip = snip.replace("@@CPV@@", rdep[0] ) + snip = snip.replace("@@EMERGEOPTS@@", config['emergeopts']) return snip def writerdepscript(job, config): |