[SCM] [contrib] Quake III: Arena launcher branch, master, updated. debian/1.2-9-g633318b

[Simon McVittie]

The following commit has been merged in the master branch:
commit e20d916af43398e3a28a0575eae5895a1baf691d
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jun 23 00:35:44 2012 +0100

    Don't refuse to start a new quake3-server if there's a stale pid file (similar to #678543)

diff --git a/debian/changelog b/debian/changelog
index 0e2cb4c..a5a57d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 quake3 (1.4) UNRELEASED; urgency=low
 
   * Add status action to init script
+  * Don't refuse to start a new quake3-server if there's a stale pid file
+    (similar to #678543)
 
  -- Simon McVittie <smcv at debian.org>  Sat, 23 Jun 2012 00:34:40 +0100
 
diff --git a/debian/quake3-server.init b/debian/quake3-server.init
index 6afbd70..344e4f3 100644
--- a/debian/quake3-server.init
+++ b/debian/quake3-server.init
@@ -26,9 +26,6 @@ if [ -f /etc/default/$NAME ] ; then
 fi
 
 q3_start() {
-    if [ -f $PIDFILE ]; then
-        return 2
-    fi
     if [ "$START_DAEMON" != 1 ]; then
         echo -n " (not starting - disabled in /etc/default/$NAME)"
         return 0

-- 
[contrib] Quake III: Arena launcher