From: "Brian C. Lane" bcl@redhat.com
commit 6defac89afcc74 added this code twice which caused the exitHandler to get called twice, causing a traceback at the end of installation. --- anaconda | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/anaconda b/anaconda index 64901ee..ccc7e58 100755 --- a/anaconda +++ b/anaconda @@ -1346,12 +1346,6 @@ if __name__ == "__main__": from pyanaconda import exception anaconda.mehConfig = exception.initExceptionHandling(anaconda)
- # add our own additional signal handlers - signal.signal(signal.SIGUSR1, lambda signum, frame: - exception.test_exception_handling()) - signal.signal(signal.SIGUSR2, lambda signum, frame: anaconda.dumpState()) - atexit.register(exitHandler, ksdata.reboot, anaconda.storage) - # Fallback to default for interactive or for a kickstart with no installation method. fallback = not (flags.automatedInstall and ksdata.method.method) payloadMgr.restartThread(anaconda.storage, ksdata, anaconda.payload, anaconda.instClass,
From: "Brian C. Lane" bcl@redhat.com
Catch it in the exception handler. --- pyanaconda/exception.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index bda8879..e698b42 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -133,7 +133,7 @@ def handleException(self, dump_info): "exception handler in it") self._main_loop_handleException(dump_info)
- except (RuntimeError, ImportError): + except (RuntimeError, ImportError, ValueError): log.debug("Gtk cannot be initialized") # X not running (Gtk cannot be initialized) if threadMgr.in_main_thread():
From: "Brian C. Lane" bcl@redhat.com
It gets fed through socket.sendall which can no longer handle strings. --- pyanaconda/anaconda_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py index 4008844..e494c14 100644 --- a/pyanaconda/anaconda_log.py +++ b/pyanaconda/anaconda_log.py @@ -87,7 +87,7 @@ def mapPriority(self, level):
class AnacondaSocketHandler(SocketHandler): def makePickle(self, record): - return self.formatter.format(record) + "\n" + return bytes(self.formatter.format(record) + "\n", "utf-8")
class AnacondaLog: SYSLOG_CFGFILE = "/etc/rsyslog.conf"
These all look good to me.
Added label: ACK.
pushed
Closed.
anaconda-patches@lists.fedorahosted.org