diff options
Diffstat (limited to 'emerge-wrapper.sh')
| -rwxr-xr-x | 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 |