From 156225f9ea22979578a2980c82f6b316cef29706 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 23 Apr 2014 17:01:17 +0200
Subject: [PATCH] [IMP] do not fail if cannot delete the pidfile. It may have a
 race-condition when in multi-workers.

bzr revid: chs@openerp.com-20140423150117-nyt16snzwvey2vz4
---
 openerp/cli/server.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 18ac69c38e2..5d731a9ad41 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -81,8 +81,11 @@ def report_configuration():
 
 def rm_pid_file():
     config = openerp.tools.config
-    if not openerp.evented and os.path.exists(config['pidfile']):
-        os.unlink(config['pidfile'])
+    if not openerp.evented and config['pidfile']:
+        try:
+            os.unlink(config['pidfile'])
+        except OSError:
+            pass
 
 def setup_pid_file():
     """ Create a file with the process id written in it.