From a0d0c337a96029c695f4739aa4f5c061a335b6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toralf=20F=C3=B6rster?= <toralf.foerster@gmx.de>
Date: Thu, 5 May 2016 10:24:24 +0200
Subject: [PATCH] bin/job.sh: handle perl upgrade issue unconditionally
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
---
 bin/job.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/job.sh b/bin/job.sh
index 796e8424..b12a6286 100755
--- a/bin/job.sh
+++ b/bin/job.sh
@@ -382,14 +382,12 @@ function GotAnIssue()  {
 
   # broken Perl upgrade: https://bugs.gentoo.org/show_bug.cgi?id=463976
   #
-  if [[ "$task" = "@system" || "$task" = "@world" ]]; then
-    grep -q "Can't locate Locale/Messages.pm in @INC" $bak
-    rc=$?
-    if [[ "$failed" = "sys-apps/help2man" || "$failed" = "dev-scheme/guile" || $rc -eq 0 ]]; then
-      Mail "info: auto-repair perl upgrade issue" $bak
-      echo -e "$task\n%perl-cleaner --all" >> $pks
-      return
-    fi
+  grep -q "Can't locate Locale/Messages.pm in @INC" $bak
+  rc=$?
+  if [[ "$failed" = "sys-apps/help2man" || "$failed" = "dev-scheme/guile" || $rc -eq 0 ]]; then
+    Mail "info: auto-repair perl upgrade issue" $bak
+    echo -e "$task\n%perl-cleaner --all" >> $pks
+    return
   fi
 
   # mask this package version for this image, prefer to continue with a lower version