summaryrefslogtreecommitdiffstats
path: root/syslogd.py
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2002-08-01 04:40:13 +0000
committerMike Fulbright <msf@redhat.com>2002-08-01 04:40:13 +0000
commit99db994323bc2d0761cb4e0f517e6389c9c47f24 (patch)
tree40c52446e2031d767e7812df5e52f68e20da3c61 /syslogd.py
parent23261e80877c94d9a3e551510acd4ca90f97bd04 (diff)
downloadanaconda-99db994323bc2d0761cb4e0f517e6389c9c47f24.tar.gz
anaconda-99db994323bc2d0761cb4e0f517e6389c9c47f24.tar.xz
anaconda-99db994323bc2d0761cb4e0f517e6389c9c47f24.zip
wrap another waitpid that can die
Diffstat (limited to 'syslogd.py')
-rw-r--r--syslogd.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/syslogd.py b/syslogd.py
index fdafbcd99..3acf1635b 100644
--- a/syslogd.py
+++ b/syslogd.py
@@ -84,7 +84,12 @@ class InstSyslog:
if self.pid == -1:
raise RuntimeError, "syslogd not running"
os.kill (self.pid, 15)
- os.waitpid (self.pid, 0)
+
+ try:
+ os.waitpid (self.pid, 0)
+ except OSError, (num, msg):
+ log("exception from waitpid in syslogd::stop: %s %s" % (num, msg))
+
self.pid = -1
syslog = InstSyslog()