Improve import/export timeout settings

[ganeti-local] / lib / daemon.py

diff --git a/lib/daemon.py b/lib/daemon.py
index 302097a..c3c4761 100644 (file)
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -671,8 +671,7 @@ def GenericMain(daemon_name, optionparser,
         prep_results = None
       logging.info("%s daemon startup", daemon_name)
     except Exception, err:
-      if wpipe is not None:
-        os.write(wpipe, _BeautifyError(err))
+      utils.WriteErrorToFD(wpipe, _BeautifyError(err))
       raise
 
     if wpipe is not None: