filter out already stable packages earlier

Drop them entirely from the package list, not only for the use flag testing.
This avoids needless rdep testing and unmasking, too.

2 files changed, 19 insertions, 16 deletions

diff --git a/scripts/tatt b/scripts/tatt
index 68897fc..f680f4e 100755
--- a/scripts/tatt
+++ b/scripts/tatt
@@ -5,6 +5,7 @@ from subprocess import *
 import sys
 import re
 import os
+import portage
 import base64
 import requests
 
@@ -182,8 +183,26 @@ if myJob.packageList is not None and len(myJob.packageList) > 0:
     print ("Jobname: " + myJob.name)
     ## Determine jobtype
 
+    port = portage.db[portage.root]["porttree"].dbapi
+
+    filteredPackages = []
     for p in myJob.packageList:
         print("Found the following package atom : " + p.packageString())
+        # check if the package already has the needed keywords
+        if config['arch']:
+            kw = port.aux_get(p.packageString()[1:], ["KEYWORDS"])
+            if len(kw) > 0:
+                kwl = kw[0].split()
+                try:
+                    kwl.index(config['arch'])
+                    # the list of keywords in portage already contains the target
+                    # keyword, skip this package
+                    print("\talready stable")
+                    continue
+                except ValueError:
+                    filteredPackages.append(p)
+
+    myJob.packageList = filteredPackages
 
     # Unmasking:
     try:
diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py
index 23eb8a1..fd2135e 100644
--- a/tatt/scriptwriter.py
+++ b/tatt/scriptwriter.py
@@ -2,7 +2,6 @@
 
 import random
 import os
-import portage
 import sys
 
 from .usecombis import findUseFlagCombis
@@ -50,8 +49,6 @@ def writeusecombiscript(job, config):
     # config is a tatt configuration
     useheader = scriptTemplate(job.name, config, "use-header")
 
-    port = portage.db[portage.root]["porttree"].dbapi
-
     outfilename = (job.name + "-useflags.sh")
     reportname = (job.name + ".report")
     if os.path.isfile(outfilename):
@@ -59,19 +56,6 @@ def writeusecombiscript(job, config):
     outfile = open(outfilename, 'w')
     outfile.write(useheader)
     for p in job.packageList:
-        # check if the package already has the needed keywords
-        if config['arch']:
-            kw = port.aux_get(p.packageString()[1:], ["KEYWORDS"])
-            if len(kw) > 0:
-                kwl = kw[0].split()
-                try:
-                    kwl.index(config['arch'])
-                    # the list of keywords in portage already contains the target
-                    # keyword, skip this package
-                    continue
-                except ValueError:
-                    pass
-
         outfile.write("# Code for " + p.packageCatName() + "\n")
         outfile.write(useCombiTestString(job.name, p, config))
         outfile.write("echo >> " + reportname + "\n")