[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Jeremy Olexa]

commit:     f0b205d91aeb3fdd8f9b6076c9425431031034e4
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 16:43:21 2011 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 16:43:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=f0b205d9

rdeps: Use new URL

---
 fetch-reverse-deps.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fetch-reverse-deps.sh b/fetch-reverse-deps.sh
index d71b529..e046502 100755
--- a/fetch-reverse-deps.sh
+++ b/fetch-reverse-deps.sh
@@ -22,7 +22,7 @@ script="$0"
 source /etc/make.tinderbox.private.conf
 
 fetchrevdeps() {
-    curl --fail ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} http://tinderbox.dev.gentoo.org/misc/{r,d}index/$1 2>/dev/null
+    curl --fail ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} http://qa-reports.gentoo.org/output/genrdeps/{r,d}index/$1 2>/dev/null
 }
 
 filterrevdeps() {

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     1156ba8cd16cf5e7bede6ad6ae3c274a291edb6a
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Wed Apr 13 12:48:53 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 12:48:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=1156ba8c

Add category to package names (screen is ambiguous).

---
 tinderbox-restart.sh |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index fbfc4db..5a1a8c8 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -45,9 +45,9 @@ ${tboxdir}/unavailable_installed.py | xargs -r emerge -C
 
 reset_emergelog
 
-emerge -u1 portage
+emerge -u1 sys-apps/portage
 
-emerge -u1 gcc
+emerge -u1 sys-devel/gcc
 if fgrep -q '>>> emerge' /var/log/emerge.log && gcc-config -l | tail -n 1 | grep -v asneeded; then
     ${tboxdir}/update-gcc-asneeded.sh
     exit 0
@@ -55,7 +55,7 @@ fi
 
 reset_emergelog
 
-if emerge -u1 perl-cleaner perl &&
+if emerge -u1 app-admin/perl-cleaner perl &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "running per-cleaner"
@@ -64,7 +64,7 @@ fi
 
 reset_emergelog
 
-if emerge -u1 ghc haskell-updater &&
+if emerge -u1 dev-lang/ghc app-admin/haskell-updater &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "running #haskell-updater"
@@ -96,10 +96,16 @@ if emerge -u1 sys-kernel/gentoo-sources &&
             make -j14 prepare modules_prepare
     popd
 
-    emerge -P gentoo-sources
+    emerge -P sys-kernel/gentoo-sources
 fi
 
-emerge -u1 glibc bti screen gentoolkit java-dep-check portage-utils
+emerge -u1 \
+    sys-libs/glibc \
+    net-misc/bti \
+    app-misc/screen \
+    app-portage/gentoolkit \
+    dev-java/java-dep-check \
+    app-portage/portage-utils
 
 reset_emergelog
 

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     5258dac6a584208d90738793876d748eaf992fb0
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Tue May  3 14:52:50 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Tue May  3 14:52:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=5258dac6

Source the private conf only if it exists.

---
 fetch-reverse-deps.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fetch-reverse-deps.sh b/fetch-reverse-deps.sh
index e046502..8f43165 100755
--- a/fetch-reverse-deps.sh
+++ b/fetch-reverse-deps.sh
@@ -19,7 +19,7 @@ DEPTH=${DEPTH:-1}
 
 script="$0"
 
-source /etc/make.tinderbox.private.conf
+[ -f /etc/make.tinderbox.private.conf ] && source /etc/make.tinderbox.private.conf
 
 fetchrevdeps() {
     curl --fail ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} http://qa-reports.gentoo.org/output/genrdeps/{r,d}index/$1 2>/dev/null

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     f49094875fa4056590b138985d2d594c8ab0e239
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Tue May  3 14:54:26 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Tue May  3 14:54:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=f4909487

Add local.start script that can be used as /etc/local.d/tinderbox.start to start tinderboxing.

---
 local.start |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/local.start b/local.start
new file mode 100755
index 0000000..50693b9
--- /dev/null
+++ b/local.start
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+screen -S tinderbox -d -m
+
+screen -S tinderbox -X zombie kr
+
+screen -S tinderbox -X screen 1 tail -F /var/log/tinderbox-fetch.log
+screen -S tinderbox -X screen 2 emerge --info
+
+screen -S tinderbox -p 0 -X kill
+screen -S tinderbox -X screen 0 sh /root/tinderbox/tinderbox-continuous.sh

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     db7cd162d0035fa836c7de4da1641cc8fb2c2a68
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Sat May 28 09:09:13 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat May 28 09:09:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=db7cd162

Make sure to source the environment in local.start script.

---
 local.start |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/local.start b/local.start
index 50693b9..dc10deb 100755
--- a/local.start
+++ b/local.start
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/bash -l
+
+source /etc/profile
 
 screen -S tinderbox -d -m
 

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     c04393b04a46f8d658be1128fdd67d9888d8f5ba
Author:     Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Sun Aug  7 12:22:27 2011 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 12:22:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=c04393b0

Save to file the list of unsatisfied USE dependencies.

When running non-interactively this output would be unreachable, so save it
to file to actually read it out separately.

---
 tinderbox-restart.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 5a1a8c8..2f96d7d 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -112,7 +112,7 @@ reset_emergelog
 # Generate a new complete list, this will also produce the list of new
 # dependencies to satisfy. Ignore new-style virtuals, leave them to be
 # merged out of dependencies.
-${tboxdir}/tinderbox.py | egrep -v '^virtual/' > /var/cache/tinderbox/list-complete
+${tboxdir}/tinderbox.py 2> /var/cache/tinderbox/use-conflicts | egrep -v '^virtual/' > /var/cache/tinderbox/list-complete
 
 # Launch the fetch operation in background, saving the log (of both
 # good results and failures).

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     b51f9d5e001289fe9121e10c17888ed764670480
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 04:07:07 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 04:07:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=b51f9d5e

Move configuration file to /etc/portage.

---
 tinderbox.make.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox.make.conf b/tinderbox.make.conf
index 83a1377..ec2e7a8 100644
--- a/tinderbox.make.conf
+++ b/tinderbox.make.conf
@@ -14,7 +14,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-source /etc/make.tinderbox.private.conf
+source /etc/portage/make.tinderbox.private.conf
 
 FETCHCOMMAND="/usr/bin/curl --fail --location --proxy ${TINDERBOX_PROXY} --output \${DISTDIR}/\${FILE} \${URI}"
 RESUMECOMMAND="/usr/bin/curl --fail --location --proxy ${TINDERBOX_PROXY} --continue-at - --output \${DISTDIR}/\${FILE} \${URI}"

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     7150744b0efc5c5a5f35e00e5c5fec309225c0c3
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 04:06:36 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 04:06:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=7150744b

Keep the make.conf ASCII. Workaround broken Python 3.

---
 tinderbox.make.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tinderbox.make.conf b/tinderbox.make.conf
index 561e93d..83a1377 100644
--- a/tinderbox.make.conf
+++ b/tinderbox.make.conf
@@ -1,5 +1,5 @@
-# Copyright © 2008-2010 Diego Elio Pettenò <flameeyes@gentoo.org>
-# Copyright © 2008-2010 Zac Medico <zmedico@gentoo.org>
+# Copyright (c) 2008-2010 Diego Elio Petteno' <flameeyes@gentoo.org>
+# Copyright (c) 2008-2010 Zac Medico <zmedico@gentoo.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     d60b42e1012cca7c73c30911353257162784f92c
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 04:31:48 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 04:31:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=d60b42e1

Fix the remaining places that use the old format.

---
 emerge-wrapper.sh     |    2 +-
 fetch-reverse-deps.sh |    2 +-
 tinderbox-restart.sh  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emerge-wrapper.sh b/emerge-wrapper.sh
index d6ae546..a6f745c 100755
--- a/emerge-wrapper.sh
+++ b/emerge-wrapper.sh
@@ -19,7 +19,7 @@ if [[ -f /var/log/emerge.log ]]; then
     rm -f /var/log/emerge.log
 fi
 
-source /etc/make.tinderbox.private.conf
+source /etc/portage/make.tinderbox.private.conf
 
 if [[ -n ${BTI_ACCOUNT} ]]; then
     dent_me() {

diff --git a/fetch-reverse-deps.sh b/fetch-reverse-deps.sh
index 8f43165..3991412 100755
--- a/fetch-reverse-deps.sh
+++ b/fetch-reverse-deps.sh
@@ -19,7 +19,7 @@ DEPTH=${DEPTH:-1}
 
 script="$0"
 
-[ -f /etc/make.tinderbox.private.conf ] && source /etc/make.tinderbox.private.conf
+[ -f /etc/portage/make.tinderbox.private.conf ] && source /etc/portage/make.tinderbox.private.conf
 
 fetchrevdeps() {
     curl --fail ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} http://qa-reports.gentoo.org/output/genrdeps/{r,d}index/$1 2>/dev/null

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 2f96d7d..88a7c0d 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -23,7 +23,7 @@ reset_emergelog() {
     rm -f /var/log/emerge.log
 }
 
-source /etc/make.tinderbox.private.conf
+source /etc/portage/make.tinderbox.private.conf
 
 if [[ -n ${BTI_ACCOUNT} ]]; then
     dent_me() {

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     641578afc71b748e61c411abaae5e6b30850a329
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 15:55:49 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 15:55:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=641578af

Record some packages to the world file for safety.

---
 tinderbox-restart.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 88a7c0d..3a51513 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -99,7 +99,7 @@ if emerge -u1 sys-kernel/gentoo-sources &&
     emerge -P sys-kernel/gentoo-sources
 fi
 
-emerge -u1 \
+emerge -u \
     sys-libs/glibc \
     net-misc/bti \
     app-misc/screen \

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     9c72e154be61af45881f0135162031adcb37b07a
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 15:56:15 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 15:56:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=9c72e154

Make sure to have Python 2.7 around.

---
 tinderbox-restart.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index cd35226..1911524 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -105,7 +105,8 @@ emerge -u \
     app-misc/screen \
     app-portage/gentoolkit \
     dev-java/java-dep-check \
-    app-portage/portage-utils
+    app-portage/portage-utils \
+    dev-lang/python:2.7
 
 reset_emergelog
 

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     6c4aa7599d5ddd3bd7ac4997c050ae81b517ded7
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 15:56:08 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 15:56:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=6c4aa759

Only list bti if we have a configured BTI account.

---
 tinderbox-restart.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 3a51513..cd35226 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -101,7 +101,7 @@ fi
 
 emerge -u \
     sys-libs/glibc \
-    net-misc/bti \
+    $([[ -n ${BTI_ACCOUNT} ]] && echo net-misc/bti) \
     app-misc/screen \
     app-portage/gentoolkit \
     dev-java/java-dep-check \

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     01468da26ffbdb275a6c5a67a4e47a4bad8da917
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri May 18 15:56:15 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri May 18 16:02:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=01468da2

Make sure to have Python 2.7 around.

---
 tinderbox-restart.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 1911524..6f28bb4 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -110,6 +110,10 @@ emerge -u \
 
 reset_emergelog
 
+# set the default Python interpreter to Python 2.7. The tinderbox is
+# experimental, but not crazy.
+eselect python set python2.7 || exit 1
+
 # Generate a new complete list, this will also produce the list of new
 # dependencies to satisfy. Ignore new-style virtuals, leave them to be
 # merged out of dependencies.

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     e32af19237b1c1f1d14c8cac300020e2ed6da0cd
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Jun 15 15:09:00 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 15:09:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=e32af192

Rename tinderbox_mask_pkg to tinderbox_failed for consistency.

---
 bashrc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bashrc b/bashrc
index 043c7ee..fea844a 100755
--- a/bashrc
+++ b/bashrc
@@ -27,7 +27,7 @@ fi
 pre_pkg_setup() {
     dent_me "${CATEGORY}/${PF} merge starting"
 
-    register_die_hook tinderbox_mask_pkg
+    register_die_hook tinderbox_failed
     register_success_hook tinderbox_success
 }
 
@@ -45,7 +45,7 @@ tinderbox_success() {
     dent_me "${CATEGORY}/${PF} merge #succeded$(tinderbox_stats)"
 }
 
-tinderbox_mask_pkg() {
+tinderbox_failed() {
     [[ ${EBUILD_PHASE} == test ]] && return 0
     dent_me "${CATEGORY}/${PF} merge #failed$(tinderbox_stats)"
     SANDBOX_ON=0 sed -i -e "\$a =${CATEGORY}/${PF}" /etc/portage/package.mask/currentrun

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     00649ea430fc51c289f7435d3055d06398f28888
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Jun 15 15:09:13 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 15:09:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=00649ea4

Disable split logs (required for proper analysis).

---
 tinderbox.make.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox.make.conf b/tinderbox.make.conf
index ec2e7a8..4b9a402 100644
--- a/tinderbox.make.conf
+++ b/tinderbox.make.conf
@@ -19,7 +19,7 @@ source /etc/portage/make.tinderbox.private.conf
 FETCHCOMMAND="/usr/bin/curl --fail --location --proxy ${TINDERBOX_PROXY} --output \${DISTDIR}/\${FILE} \${URI}"
 RESUMECOMMAND="/usr/bin/curl --fail --location --proxy ${TINDERBOX_PROXY} --continue-at - --output \${DISTDIR}/\${FILE} \${URI}"
 
-FEATURES="test test-fail-continue -unmerge-logs split-log userpriv usersandbox -preserve-libs"
+FEATURES="test test-fail-continue -unmerge-logs userpriv usersandbox -preserve-libs"
 
 ACCEPT_LICENSE="*"
 ACCEPT_PROPERTIES="* -interactive"

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     d461fd716f06950acc65e70c629e93e6622992e6
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Jun 15 15:09:44 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 15:09:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=d461fd71

Send the log to the analysis system whenever a package fails or succeeds.

---
 bashrc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/bashrc b/bashrc
index fea844a..6ad45d3 100755
--- a/bashrc
+++ b/bashrc
@@ -41,14 +41,24 @@ tinderbox_stats() {
     fi
 }
 
+tinderbox_send_log() {
+    tar cf - "${PORTAGE_LOG_FILE}" | \
+	nc6 --send-only --hold-timeout=0 ${TINDERBOX_ANALYSIS_ADDR}
+}
+
 tinderbox_success() {
     dent_me "${CATEGORY}/${PF} merge #succeded$(tinderbox_stats)"
+
+    tinderbox_send_log
 }
 
 tinderbox_failed() {
     [[ ${EBUILD_PHASE} == test ]] && return 0
+
     dent_me "${CATEGORY}/${PF} merge #failed$(tinderbox_stats)"
     SANDBOX_ON=0 sed -i -e "\$a =${CATEGORY}/${PF}" /etc/portage/package.mask/currentrun
+
+    tinderbox_send_log
 }
 
 tinderbox_if_file() {

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     c1bcfdbf405f07d53e23e81875bfdc804d93337d
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jun 16 14:38:57 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 14:38:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=c1bcfdbf

If we have an automake failure, inline the log file, this way we don't have to hunt for it.

---
 bashrc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/bashrc b/bashrc
index f84bb64..6f1ed40 100755
--- a/bashrc
+++ b/bashrc
@@ -62,6 +62,11 @@ tinderbox_failed() {
     dent_me "${CATEGORY}/${PF} merge #failed$(tinderbox_stats)"
     SANDBOX_ON=0 sed -i -e "\$a =${CATEGORY}/${PF}" /etc/portage/package.mask/currentrun
 
+    # check if this is an automake failure and if so, get the whole log inlined
+    if grep -f -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
+	cat "${T}"/automake.log
+    fi
+
     tinderbox_send_log
 }
 

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     91956ecb040a90128e4578ac7072679b7a760cf7
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jun 16 14:38:36 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 14:38:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=91956ecb

No-op on log sending when the analysis address is unset.

---
 bashrc |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bashrc b/bashrc
index 6ad45d3..f84bb64 100755
--- a/bashrc
+++ b/bashrc
@@ -41,10 +41,14 @@ tinderbox_stats() {
     fi
 }
 
-tinderbox_send_log() {
-    tar cf - "${PORTAGE_LOG_FILE}" | \
-	nc6 --send-only --hold-timeout=0 ${TINDERBOX_ANALYSIS_ADDR}
-}
+if [[ -n "${TINDERBOX_ANALYSIS_ADDR}" ]]; then
+    tinderbox_send_log() {
+	tar cf - "${PORTAGE_LOG_FILE}" | \
+	    nc6 --send-only --hold-timeout=0 ${TINDERBOX_ANALYSIS_ADDR}
+    }
+else
+    tinderbox_send_log() { :; }
+fi
 
 tinderbox_success() {
     dent_me "${CATEGORY}/${PF} merge #succeded$(tinderbox_stats)"

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     d0f247900d54cd07bed1621378d0528fbb52f73f
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jun 16 14:45:31 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 14:45:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=d0f24790

Fix typo.

---
 bashrc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bashrc b/bashrc
index 6f1ed40..e9b6a13 100755
--- a/bashrc
+++ b/bashrc
@@ -63,7 +63,7 @@ tinderbox_failed() {
     SANDBOX_ON=0 sed -i -e "\$a =${CATEGORY}/${PF}" /etc/portage/package.mask/currentrun
 
     # check if this is an automake failure and if so, get the whole log inlined
-    if grep -f -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
+    if fgrep -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
 	cat "${T}"/automake.log
     fi
 

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     095a6e741c2663a7f14d125f3fb4935e294b273a
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jun 16 14:48:54 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 14:48:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=095a6e74

Quiet the log sending.

---
 bashrc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bashrc b/bashrc
index e9b6a13..0f81918 100755
--- a/bashrc
+++ b/bashrc
@@ -43,8 +43,9 @@ tinderbox_stats() {
 
 if [[ -n "${TINDERBOX_ANALYSIS_ADDR}" ]]; then
     tinderbox_send_log() {
-	tar cf - "${PORTAGE_LOG_FILE}" | \
-	    nc6 --send-only --hold-timeout=0 ${TINDERBOX_ANALYSIS_ADDR}
+	tar -P -cf - "${PORTAGE_LOG_FILE}" | \
+	    nc6 --send-only --hold-timeout=0 ${TINDERBOX_ANALYSIS_ADDR} \
+	    >/dev/null
     }
 else
     tinderbox_send_log() { :; }

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     d9d2ef0a4a679ca48393abec170beec9aee0d87a
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jun 16 14:51:57 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 14:51:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=d9d2ef0a

And use the right name.

---
 bashrc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bashrc b/bashrc
index 0f81918..5bb042d 100755
--- a/bashrc
+++ b/bashrc
@@ -65,7 +65,7 @@ tinderbox_failed() {
 
     # check if this is an automake failure and if so, get the whole log inlined
     if fgrep -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
-	cat "${T}"/automake.log
+	cat "${T}"/automake.out
     fi
 
     tinderbox_send_log

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     05a34f1bdf825f08112668f9a78d88aeda53e67e
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jun 16 14:57:12 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 14:57:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=05a34f1b

Enable fail-clean or there won't be enough space.

---
 tinderbox.make.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox.make.conf b/tinderbox.make.conf
index 4b9a402..e31781a 100644
--- a/tinderbox.make.conf
+++ b/tinderbox.make.conf
@@ -19,7 +19,7 @@ source /etc/portage/make.tinderbox.private.conf
 FETCHCOMMAND="/usr/bin/curl --fail --location --proxy ${TINDERBOX_PROXY} --output \${DISTDIR}/\${FILE} \${URI}"
 RESUMECOMMAND="/usr/bin/curl --fail --location --proxy ${TINDERBOX_PROXY} --continue-at - --output \${DISTDIR}/\${FILE} \${URI}"
 
-FEATURES="test test-fail-continue -unmerge-logs userpriv usersandbox -preserve-libs"
+FEATURES="test test-fail-continue -unmerge-logs userpriv usersandbox -preserve-libs fail-clean"
 
 ACCEPT_LICENSE="*"
 ACCEPT_PROPERTIES="* -interactive"

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     4eb00f71f81feb1707cdabc873c807cbdc0d414c
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Tue Jun 19 18:59:05 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 18:59:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=4eb00f71

Also cat aclocal.out if present.

---
 bashrc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/bashrc b/bashrc
index 5bb042d..4ad5bba 100755
--- a/bashrc
+++ b/bashrc
@@ -67,6 +67,9 @@ tinderbox_failed() {
     if fgrep -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
 	cat "${T}"/automake.out
     fi
+    if fgrep -q "/temp/aclocal.out" "${PORTAGE_LOG_FILE}"; then
+	cat "${T}"/aclocal.out
+    fi
 
     tinderbox_send_log
 }

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     327c6663785dc1957d42714fc774ef777760302d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 10:47:49 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 10:47:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=327c6663

Output REQUIRED_USE conflicts as well as unsatisfied USE deps.

---
 tinderbox.py |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/tinderbox.py b/tinderbox.py
index ab78a29..3c4a37f 100755
--- a/tinderbox.py
+++ b/tinderbox.py
@@ -129,6 +129,15 @@ for cp in portdb.cp_all():
 				print cp
 
 for cpv in good_pkgs:
+
+	required_use, use = fakedb.aux_get(cpv, ["REQUIRED_USE", "USE"])
+	if required_use:
+		req_use_check = portage.dep.check_required_use(required_use,
+			set(use.split()), lambda x: True)
+		if not req_use_check:
+			sys.stderr.write("%s has unsatisfied REQUIRED_USE=\"%s\" with"
+				" USE=\"%s\"\n" % (cpv, req_use_check.tounicode(), use))
+
 	for atom in deps[cpv]:
 		if atom.blocker:
 			continue

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     b7cc940f300bcc04b8cccb128411e898b2bbd189
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Jun 22 19:45:35 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 19:45:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=b7cc940f

tinderbox-restart.sh: make sure to rebuild languages if changing USEs

This is important for things like perl's ithreads USE as that requires
a perl-cleaner run.

---
 tinderbox-restart.sh |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 6f28bb4..0314b97 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -45,9 +45,9 @@ ${tboxdir}/unavailable_installed.py | xargs -r emerge -C
 
 reset_emergelog
 
-emerge -u1 sys-apps/portage
+emerge -Nu1 sys-apps/portage
 
-emerge -u1 sys-devel/gcc
+emerge -Nu1 sys-devel/gcc
 if fgrep -q '>>> emerge' /var/log/emerge.log && gcc-config -l | tail -n 1 | grep -v asneeded; then
     ${tboxdir}/update-gcc-asneeded.sh
     exit 0
@@ -55,7 +55,7 @@ fi
 
 reset_emergelog
 
-if emerge -u1 app-admin/perl-cleaner perl &&
+if emerge -Nu1 app-admin/perl-cleaner dev-lang/perl &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "running per-cleaner"
@@ -64,7 +64,7 @@ fi
 
 reset_emergelog
 
-if emerge -u1 dev-lang/ghc app-admin/haskell-updater &&
+if emerge -Nu1 dev-lang/ghc app-admin/haskell-updater &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "running #haskell-updater"
@@ -73,7 +73,7 @@ fi
 
 reset_emergelog
 
-if emerge -u1 dev-lang/ocaml &&
+if emerge -Nu1 dev-lang/ocaml &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "running #ocaml-rebuild"
@@ -85,7 +85,7 @@ reset_emergelog
 
 [[ -f /usr/src/linux/.config ]] && cp /usr/src/linux/.config /usr/src/config
 
-if emerge -u1 sys-kernel/gentoo-sources &&
+if emerge -Nu1 sys-kernel/gentoo-sources &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "new #gentoo-sources, making oldconfig"

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     b678d3d150419077c0cf08d641204a155c41d315
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Jun 22 19:49:34 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 19:49:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=b678d3d1

Avoid subshell.

---
 tinderbox-restart.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 0ca9b55..4cdc040 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -101,7 +101,7 @@ fi
 
 emerge -u \
     sys-libs/glibc \
-    $([[ -n ${BTI_ACCOUNT} ]] && echo net-misc/bti) \
+    ${BTI_ACCOUNT:+net-misc/bti} \
     ${TINDERBOX_ANALYSIS_ADDR:+net-analyzer/netcat6} \
     app-misc/screen \
     app-portage/gentoolkit \

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     4ab9357cc707c28715efd1a9ff594f35ec108359
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Fri Jun 22 19:49:15 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 19:49:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=4ab9357c

Add netcat6 to the list if ${TINDERBOX_ANALYSIS_ADDR} is set.

---
 tinderbox-restart.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 0314b97..0ca9b55 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -102,6 +102,7 @@ fi
 emerge -u \
     sys-libs/glibc \
     $([[ -n ${BTI_ACCOUNT} ]] && echo net-misc/bti) \
+    ${TINDERBOX_ANALYSIS_ADDR:+net-analyzer/netcat6} \
     app-misc/screen \
     app-portage/gentoolkit \
     dev-java/java-dep-check \

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     f8fa9cc0e886ab584f12e77c33471b7d0129d9a2
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sun Jul 15 10:28:05 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 10:28:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=f8fa9cc0

Make it more generic and more reliable to pick up autotools failure logs.

---
 bashrc |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bashrc b/bashrc
index 4ad5bba..c1ae0eb 100755
--- a/bashrc
+++ b/bashrc
@@ -63,13 +63,18 @@ tinderbox_failed() {
     dent_me "${CATEGORY}/${PF} merge #failed$(tinderbox_stats)"
     SANDBOX_ON=0 sed -i -e "\$a =${CATEGORY}/${PF}" /etc/portage/package.mask/currentrun
 
-    # check if this is an automake failure and if so, get the whole log inlined
-    if fgrep -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
-	cat "${T}"/automake.out
-    fi
-    if fgrep -q "/temp/aclocal.out" "${PORTAGE_LOG_FILE}"; then
-	cat "${T}"/aclocal.out
-    fi
+    # check if this is an autotools failure and if so, get the whole log inlined
+    for filename in {autoconf,automake,aclocal}{,-1}; do
+	if fgrep -q "/temp/${filename}.out" "${PORTAGE_LOG_FILE}"; then
+	    cat - <<EOF
+######## ${filename}.out ########
+EOF
+	    cat "${T}"/${filename}.out
+	    cat - <<EOF
+#################################
+EOF
+	fi
+    done
 
     tinderbox_send_log
 }

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     fa87ccd02417f0c4b3a4f5545948df68585432c7
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sun Jul 15 10:31:15 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 10:31:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=fa87ccd0

Add space.

---
 bashrc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/bashrc b/bashrc
index c1ae0eb..3f083b6 100755
--- a/bashrc
+++ b/bashrc
@@ -67,11 +67,13 @@ tinderbox_failed() {
     for filename in {autoconf,automake,aclocal}{,-1}; do
 	if fgrep -q "/temp/${filename}.out" "${PORTAGE_LOG_FILE}"; then
 	    cat - <<EOF
+
 ######## ${filename}.out ########
 EOF
 	    cat "${T}"/${filename}.out
 	    cat - <<EOF
 #################################
+
 EOF
 	fi
     done

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     4c295e2c25733ce49c95bd8569081502cdf377a1
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Thu Nov  1 16:53:48 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 16:53:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=4c295e2c

Output lapack/blas/cblas selection on every merge.

---
 bashrc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/bashrc b/bashrc
index 3f083b6..6198ac2 100755
--- a/bashrc
+++ b/bashrc
@@ -29,6 +29,10 @@ pre_pkg_setup() {
 
     register_die_hook tinderbox_failed
     register_success_hook tinderbox_success
+
+    eselect lapack list
+    eselect blas list
+    eselect cblas list
 }
 
 tinderbox_stats() {

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     4b85508530ee14a013c0421a75908d63a3df7747
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Thu Nov  1 18:51:24 2012 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 18:51:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=4b855085

Disable colour in eselect.

---
 bashrc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bashrc b/bashrc
index 6198ac2..04dca5d 100755
--- a/bashrc
+++ b/bashrc
@@ -30,9 +30,9 @@ pre_pkg_setup() {
     register_die_hook tinderbox_failed
     register_success_hook tinderbox_success
 
-    eselect lapack list
-    eselect blas list
-    eselect cblas list
+    eselect --colour=no lapack list
+    eselect --colour=no blas list
+    eselect --colour=no cblas list
 }
 
 tinderbox_stats() {

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     45eb2725e20af40caf07c81e582402eb382e6d47
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jan 26 00:22:40 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 00:22:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=45eb2725

Try running the merge with USE=-doc first, then fall back to FEATURES=-test.

---
 emerge-wrapper.sh |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/emerge-wrapper.sh b/emerge-wrapper.sh
index 1bd3ba1..74ac178 100755
--- a/emerge-wrapper.sh
+++ b/emerge-wrapper.sh
@@ -27,8 +27,8 @@ else
     dent_me() { :; }
 fi
 
-# Don't tweet this away if we're running a non-test try
-if [[ -z "${FEATURES}" ]]; then
+# Don't tweet this away if we're running a second-tier try
+if [[ -z "${USE}" ]]; then
     dent_me "$1 queued"
 fi
 
@@ -42,9 +42,14 @@ if [[ $res != 0 ]]; then
     if ! fgrep -q ">>> emerge" /var/log/emerge.log; then
 	# Here it means that the merge was rejected; the common case
 	# it's a cyclic dependency that Portage cannot break, which is
-	# unfortunately common when enabling tests e.g. with Ruby-NG
-	# ebuilds. To try recovering from this, try a merge without
-	# test features enabled.
+	# unfortunately common when enabling tests or doc, usually
+	# with Ruby ebuilds, but no longer limited to them. To find a
+	# way around this, we first check for a build with USE=-doc,
+	# and then one with FEATURES=-test as well. This does mean
+	# that we skip the tests on a doc circular dependency
+	# unfortunately.
+	if [[ -z "${USE}" ]]; then
+	    USE=-doc $0 "$@"
 	if [[ -z "${FEATURES}" ]]; then
 	    FEATURES=-test $0 "$@"
 	else

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     df7e31778afef98f28d2e3eb660e6f9769728e80
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jan 26 00:21:45 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 00:21:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=df7e3177

Avoid deleting the emerge.log, just truncate it.

---
 emerge-wrapper.sh    |    6 ++----
 tinderbox-restart.sh |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/emerge-wrapper.sh b/emerge-wrapper.sh
index a6f745c..1bd3ba1 100755
--- a/emerge-wrapper.sh
+++ b/emerge-wrapper.sh
@@ -15,9 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-if [[ -f /var/log/emerge.log ]]; then
-    rm -f /var/log/emerge.log
-fi
+echo > /var/log/emerge.log
 
 source /etc/portage/make.tinderbox.private.conf
 
@@ -58,4 +56,4 @@ if [[ $res != 0 ]]; then
     fi
 fi
 
-rm -f /var/log/emerge.log
+echo > /var/log/emerge.log

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 4cdc040..14c8e87 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -20,7 +20,7 @@ tboxdir=$(dirname $0)
 mkdir -p /var/cache/tinderbox
 
 reset_emergelog() {
-    rm -f /var/log/emerge.log
+    echo > /var/log/emerge.log
 }
 
 source /etc/portage/make.tinderbox.private.conf

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     cc8be4828a28a06505ac561ebd4700501d64f15b
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jan 26 00:22:51 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 00:22:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=cc8be482

Mark all news as read during restart.

---
 tinderbox-restart.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 14c8e87..b2c89ad 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -38,6 +38,7 @@ set -e
 dent_me "#syncing anew upon request"
 
 emerge --sync
+eselect news read new
 
 echo > /etc/portage/package.mask/currentrun
 

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     8a0be26c4c38f40e638bfc39f23b3e9dfcead547
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jan 26 01:14:58 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 01:14:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=8a0be26c

Fix syntax.

---
 emerge-wrapper.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/emerge-wrapper.sh b/emerge-wrapper.sh
index 74ac178..3b2b8ad 100755
--- a/emerge-wrapper.sh
+++ b/emerge-wrapper.sh
@@ -50,7 +50,7 @@ if [[ $res != 0 ]]; then
 	# unfortunately.
 	if [[ -z "${USE}" ]]; then
 	    USE=-doc $0 "$@"
-	if [[ -z "${FEATURES}" ]]; then
+	elif [[ -z "${FEATURES}" ]]; then
 	    FEATURES=-test $0 "$@"
 	else
 	    # This only hits the second time, so we're safely assuming

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     95b3f8b773f19dbd125cfd684d1617835d6c6cb0
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sat Jan 26 14:48:14 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 14:48:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=95b3f8b7

Update the --as-needed specs hacking so that it works with hardened toolchain.

Previously, this caused the --as-needed hack to be applied over and
over and over again every time a GCC was to be rebuilt for whatever
reason. Now it'll only be applied once.

---
 tinderbox-restart.sh   |    2 +-
 update-gcc-asneeded.sh |   20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index b2c89ad..2d555a9 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -49,7 +49,7 @@ reset_emergelog
 emerge -Nu1 sys-apps/portage
 
 emerge -Nu1 sys-devel/gcc
-if fgrep -q '>>> emerge' /var/log/emerge.log && gcc-config -l | tail -n 1 | grep -v asneeded; then
+if fgrep -q '>>> emerge' /var/log/emerge.log; then
     ${tboxdir}/update-gcc-asneeded.sh
     exit 0
 fi

diff --git a/update-gcc-asneeded.sh b/update-gcc-asneeded.sh
index 38f5717..31c348c 100755
--- a/update-gcc-asneeded.sh
+++ b/update-gcc-asneeded.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 2007-2010 Diego Elio Pettenò <flameeyes@gentoo.org>
+# Copyright © 2007-2013 Diego Elio Pettenò <flameeyes@gentoo.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,9 +15,15 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-export SPECSFILE=$(dirname "$(gcc -print-libgcc-file-name)")/asneeded.specs
-export CURRPROFILE=/etc/env.d/gcc/$(gcc-config -c)
-gcc -dumpspecs | sed -e '/link:/,+1 s:--eh-frame-hdr:\0 --as-needed:' > "$SPECSFILE"
-sed "${CURRPROFILE}" -e '1i\GCC_SPECS='$SPECSFILE > "${CURRPROFILE}-asneeded"
-gcc-config "$(basename "${CURRPROFILE}")-asneeded"
-source /etc/profile
+SPECSFILE=$(dirname "$(gcc -print-libgcc-file-name)")/asneeded.specs
+CURRPROFILE=$(gcc-config -c)
+PROFILEFILE=/etc/env.d/gcc/$(gcc-config -c)
+
+# only proceed with the changes if we're not already on an asneeded
+# profile.
+if [ ${CURRPROFILE/asneeded} = ${CURRPROFILE} ]; then
+    gcc -dumpspecs | sed -e '/link:/,+1 s:--eh-frame-hdr:\0 --as-needed:' > "$SPECSFILE"
+    sed "${PROFILEFILE}" -e '1i\GCC_SPECS='$SPECSFILE > "${PROFILEFILE}-asneeded"
+    gcc-config "${CURRPROFILE}-asneeded"
+    source /etc/profile
+fi

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     ace9364a337d5e0f64d11270c0072a11dedf3f43
Author:     Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Tue Feb 19 20:38:59 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 20:38:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=ace9364a

Use --keep-going in the haskell updater.

---
 tinderbox-restart.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 2d555a9..5e85a6e 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -69,7 +69,7 @@ if emerge -Nu1 dev-lang/ghc app-admin/haskell-updater &&
     fgrep -q '>>> emerge' /var/log/emerge.log; then
 
     dent_me "running #haskell-updater"
-    /usr/sbin/haskell-updater --upgrade
+    /usr/sbin/haskell-updater --upgrade -- --keep-going
 fi
 
 reset_emergelog

[gentoo-commits] proj/flameeyes-tinderbox:master commit in: /

[Diego Elio Pettenò]

commit:     44735245306928519e35ea86cdf6cf3cdc87cbcf
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 13:42:34 2013 +0000
Commit:     Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 13:42:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=44735245

Add support for sub-slots.

---
 tinderbox.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tinderbox.py b/tinderbox.py
index 3c4a37f..de1ecb4 100755
--- a/tinderbox.py
+++ b/tinderbox.py
@@ -90,7 +90,7 @@ for cp in portdb.cp_all():
 				# in the slot then drop it in order to avoid a slot
 				# conflict.
 				slot_atom = "%s:%s" % (portage.cpv_getkey(dep_pkg),
-					metadata["SLOT"])
+					metadata["SLOT"].split("/")[0])
 				best_visible_slot = portdb.xmatch("bestmatch-visible",
 					slot_atom)
 				if dep_pkg != best_visible_slot: