[PATCH 1/2] Include NetworkManager-glib in anaconda-core

[Brian C. Lane]

---
 anaconda.spec.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index fb07cb5..c5a270d 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -124,6 +124,7 @@ Requires: isomd5sum >= %{isomd5sum}
 Requires: yum-utils >= %{yumutilsver}
 Requires: createrepo_c
 Requires: NetworkManager >= %{nmver}
+Requires: NetworkManager-glib >= %{nmver}
 Requires: dhclient
 Requires: libselinux-python
 Requires: kbd

[PATCH 2/2] Use a formatter on remotelog lines

[Brian C. Lane]

---
 pyanaconda/anaconda_log.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py
index b5e525c..8cb48ec 100644
--- a/pyanaconda/anaconda_log.py
+++ b/pyanaconda/anaconda_log.py
@@ -88,7 +88,7 @@ class AnacondaSyslogHandler(SysLogHandler):

class AnacondaSocketHandler(SocketHandler):
     def makePickle(self, record):
-        return ENTRY_FORMAT % record.__dict__ + "\n"
+        return self.formatter.format(record) + "\n"

class AnacondaLog:
     SYSLOG_CFGFILE  = "/etc/rsyslog.conf"
@@ -209,6 +209,7 @@ class AnacondaLog:

def setup_remotelog(self, host, port):
         remotelog = AnacondaSocketHandler(host, port)
+        remotelog.setFormatter(logging.Formatter(ENTRY_FORMAT, DATE_FORMAT))
         remotelog.setLevel(logging.DEBUG)
         logging.getLogger().addHandler(remotelog)

[Vratislav Podzimek]

These both look good to me.