[gentoo-commits] proj/tatt:master commit in: tatt/

[gentoo-commits] proj/tatt:master commit in: tatt/

[Rolf Eike Beer]

commit:     25700e2a7bc4df107b42bd1ab78b0599178b5941
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Feb  4 15:48:28 2020 +0000
Commit:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
CommitDate: Tue Feb  4 15:48:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=25700e2a

also match ~arch in package list

This isn't uncommon for keywording bugs. It is also accepted for stabilization
bugs at the moment because it simplifies the code.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>

 tatt/packageFinder.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tatt/packageFinder.py b/tatt/packageFinder.py
index 5a8a099..a404d39 100644
--- a/tatt/packageFinder.py
+++ b/tatt/packageFinder.py
@@ -13,7 +13,8 @@ def findPackages (s, arch):
         if not line:
             continue
         atom, _, arches = line.replace('\t', ' ').partition(' ')
-        if not arches or arch in arches.split(' '):
+        archlist = arches.split(' ')
+        if not arches or arch in archlist or ('~' + arch) in archlist:
             packages.append(gP(atom))
 
     return(packages)

[gentoo-commits] proj/tatt:master commit in: tatt/

[Sam James]

commit:     d023294af12750f1c9ff4d97b4d449eae6f57dcb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 03:04:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 03:04:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=d023294a

tatt/usecombis.py: Give up after too many USE-generation attempts

Closes: #40
Signed-off-by: Sam James <sam <AT> gentoo.org>

 tatt/usecombis.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tatt/usecombis.py b/tatt/usecombis.py
index fb67be7..c24a82c 100644
--- a/tatt/usecombis.py
+++ b/tatt/usecombis.py
@@ -46,11 +46,31 @@ def findUseFlagCombis (package, config, port):
             swlist.append(2**len(uselist) - 1)
     # Test if we can exhaust all USE-combis by computing the binary logarithm.
     elif len(uselist) > math.log(config['usecombis'],2):
+        
         # Generate a sample of USE combis
         s = 2**(len (uselist))
         rnds = set()
         random.seed()
+        
+        attempts = 0
+        ignore_use_expand = False
+
         while len(swlist) < config['usecombis'] and len(rnds) < s:
+            if attempts >= 10000 and not ignore_use_expand:
+                # After 10000 attempts, let's give up on USE_EXPAND.
+                ignore_use_expand = True
+                attempts = 0
+
+                print("Giving up on USE_EXPAND after {0} tries to find valid USE combinations".format(attempts))
+                print("We've found {0} USE combinations so far".format(len(swlist)))
+                uselist = [use for use in uselist if not "_" in use]
+                
+            if attempts >= 10000 and ignore_use_expand:
+                # Let's give up entirely and use what we have.
+                print("Giving up on finding more USE combinations after {0} further attempts".format(attempts))
+                print("We've found {0} USE combinations".format(len(swlist)))
+                break
+
             r = random.randint(0, s-1)
             if r in rnds:
                 # already checked
@@ -58,6 +78,7 @@ def findUseFlagCombis (package, config, port):
             rnds.add(r)
 
             if not check_uses(ruse, uselist, r, package):
+                attempts += 1
                 # invalid combination
                 continue
 

[gentoo-commits] proj/tatt:master commit in: tatt/

[Sam James]

commit:     b64c30c124116d88ffb7339db6a7dd798b22e04f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 21:45:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 21:45:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=b64c30c1

tatt/usecombis.py: Tidy up

Signed-off-by: Sam James <sam <AT> gentoo.org>

 tatt/usecombis.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tatt/usecombis.py b/tatt/usecombis.py
index c24a82c..1603b6b 100644
--- a/tatt/usecombis.py
+++ b/tatt/usecombis.py
@@ -56,20 +56,20 @@ def findUseFlagCombis (package, config, port):
         ignore_use_expand = False
 
         while len(swlist) < config['usecombis'] and len(rnds) < s:
-            if attempts >= 10000 and not ignore_use_expand:
-                # After 10000 attempts, let's give up on USE_EXPAND.
-                ignore_use_expand = True
-                attempts = 0
+            if attempts >= 10000:
+                if not ignore_use_expand:
+                    # After 10000 attempts, let's give up on USE_EXPAND.
+                    ignore_use_expand = True
+                    attempts = 0
 
-                print("Giving up on USE_EXPAND after {0} tries to find valid USE combinations".format(attempts))
-                print("We've found {0} USE combinations so far".format(len(swlist)))
-                uselist = [use for use in uselist if not "_" in use]
-                
-            if attempts >= 10000 and ignore_use_expand:
-                # Let's give up entirely and use what we have.
-                print("Giving up on finding more USE combinations after {0} further attempts".format(attempts))
-                print("We've found {0} USE combinations".format(len(swlist)))
-                break
+                    print("Giving up on USE_EXPAND after {0} tries to find valid USE combinations".format(attempts))
+                    print("We've found {0} USE combinations so far".format(len(swlist)))
+                    uselist = [use for use in uselist if not "_" in use]
+                else:
+                    # Let's give up entirely and use what we have.
+                    print("Giving up on finding more USE combinations after {0} further attempts".format(attempts))
+                    print("We've found {0} USE combinations".format(len(swlist)))
+                    break
 
             r = random.randint(0, s-1)
             if r in rnds:

[gentoo-commits] proj/tatt:master commit in: tatt/

[Sam James]

commit:     2995ef1e25ed96bb79bd1a262a3578d633cb7a5c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 06:00:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 06:01:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=2995ef1e

packageFinder.py: strip out ~ from 'arch' before passing to nattka

Reported-by: Jakov Smolić <jsmolic <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 tatt/packageFinder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tatt/packageFinder.py b/tatt/packageFinder.py
index fe1256e..4b32b6e 100644
--- a/tatt/packageFinder.py
+++ b/tatt/packageFinder.py
@@ -11,7 +11,7 @@ def findPackages (s, arch, repo, bugnum=False):
 
     if bugnum:
             print("Using Nattka to process the bug")
-            output = subprocess.check_output(['nattka', '--repo', repo, 'apply', '-a', arch, '-n', bugnum, '--ignore-sanity-check', '--ignore-dependencies'])
+            output = subprocess.check_output(['nattka', '--repo', repo, 'apply', '-a', arch.replace("~", ""), '-n', bugnum, '--ignore-sanity-check', '--ignore-dependencies'])
             output = output.decode("utf8").split("\n")
             output = [line for line in output if not line.startswith("#")]
             output = [line.split(" ")[0] for line in output]

[gentoo-commits] proj/tatt:master commit in: tatt/

[Sam James]

commit:     efb6c67172d2f53047dca0dd0573ee2de559f4d7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  2 12:12:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  2 12:12:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=efb6c671

tatt/dot-tatt-spec: default to arch=amd64, not x86

Signed-off-by: Sam James <sam <AT> gentoo.org>

 tatt/dot-tatt-spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tatt/dot-tatt-spec b/tatt/dot-tatt-spec
index 33aff95..67eb90b 100644
--- a/tatt/dot-tatt-spec
+++ b/tatt/dot-tatt-spec
@@ -2,7 +2,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/")
 unmaskdir=string(default="/etc/portage/package.accept_keywords")
-arch=string(default="x86")
+arch=string(default="amd64")
 defaultopts=string(default="")
 emergeopts=string(default="")
 rdeps=integer(0,512,default=10)

[gentoo-commits] proj/tatt:master commit in: tatt/

[Sam James]

commit:     70486f7f37870796975ce228751fee68c64cfc88
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 19:34:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 19:34:37 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tatt.git/commit/?id=70486f7f

scriptwriter.py: only query rdeps site if rdeps config > 0

No point fetching if we're not testing any.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 tatt/scriptwriter.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py
index 4d60e34..38437f5 100644
--- a/tatt/scriptwriter.py
+++ b/tatt/scriptwriter.py
@@ -120,7 +120,8 @@ def writerdepscript(job, config):
     for p in job.packageList:
         atom = p.packageCatName()
         pkgs.append(atom)
-        rdeps = rdeps + stablerdeps (atom, config)
+        if config['rdeps'] > 0:
+            rdeps = rdeps + stablerdeps (atom, config)
     if len(rdeps) == 0:
         print("No stable rdeps for " + job.name)
         return