From 4873add6e11c1bd421c83cd08df589f1184aa673 Mon Sep 17 00:00:00 2001
From: Andrew Geissler <geissonator@yahoo.com>
Date: Mon, 2 Nov 2020 18:44:49 -0600
Subject: Revert "poky: subtree update:b23aa6b753..ad30a6d470"

This reverts commit af5e4ef732faedf66c6dc1756432e9de2ac72988.

This commit introduced openbmc/openbmc#3720 and no solution has been
forthcoming. Revert until we can get to the bottom of this.

Change-Id: I2fb0d81eb26cf3dadb2f2abdd1a1bb7a95eaf03c
---
 poky/bitbake/lib/bb/command.py        |  6 +-----
 poky/bitbake/lib/bb/server/process.py |  1 -
 poky/bitbake/lib/bb/tinfoil.py        | 11 +----------
 3 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'poky/bitbake/lib')

diff --git a/poky/bitbake/lib/bb/command.py b/poky/bitbake/lib/bb/command.py
index dd77cdd6e2..f8c6a03bb9 100644
--- a/poky/bitbake/lib/bb/command.py
+++ b/poky/bitbake/lib/bb/command.py
@@ -81,12 +81,8 @@ class Command:
                 result = command_method(self, commandline)
             except CommandError as exc:
                 return None, exc.args[0]
-            except (Exception, SystemExit) as exc:
+            except (Exception, SystemExit):
                 import traceback
-                if isinstance(exc, bb.BBHandledException):
-                    # We need to start returning real exceptions here. Until we do, we can't
-                    # tell if an exception is an instance of bb.BBHandledException
-                    return None, "bb.BBHandledException()\n" + traceback.format_exc()
                 return None, traceback.format_exc()
             else:
                 return result, None
diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py
index b27b4aefe0..c7cb34f0cc 100644
--- a/poky/bitbake/lib/bb/server/process.py
+++ b/poky/bitbake/lib/bb/server/process.py
@@ -217,7 +217,6 @@ class ProcessServer():
                     self.command_channel_reply.send(self.cooker.command.runCommand(command))
                     serverlog("Command Completed")
                 except Exception as e:
-                   serverlog('Exception in server main event loop running command %s (%s)' % (command, str(e)))
                    logger.exception('Exception in server main event loop running command %s (%s)' % (command, str(e)))
 
             if self.xmlrpc in ready:
diff --git a/poky/bitbake/lib/bb/tinfoil.py b/poky/bitbake/lib/bb/tinfoil.py
index 763c329810..2fb1bb7d27 100644
--- a/poky/bitbake/lib/bb/tinfoil.py
+++ b/poky/bitbake/lib/bb/tinfoil.py
@@ -461,16 +461,7 @@ class Tinfoil:
         commandline = [command]
         if params:
             commandline.extend(params)
-        try:
-            result = self.server_connection.connection.runCommand(commandline)
-        finally:
-            while True:
-                event = self.wait_event()
-                if not event:
-                    break
-                if isinstance(event, logging.LogRecord):
-                    if event.taskpid == 0 or event.levelno > logging.INFO:
-                        self.logger.handle(event)
+        result = self.server_connection.connection.runCommand(commandline)
         if result[1]:
             raise TinfoilCommandFailed(result[1])
         return result[0]
-- 
cgit v1.2.3