[Python-apps-commits] r4354 - in packages/autokey/trunk/debian/patches (2 files)

[ffm-guest at users.alioth.debian.org]

    Date: Wednesday, December 23, 2009 @ 20:35:14
  Author: ffm-guest
Revision: 4354

Remove 1000-daemon-fix merged upstream.

Modified:
  packages/autokey/trunk/debian/patches/00list
Deleted:
  packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch

Modified: packages/autokey/trunk/debian/patches/00list
===================================================================
--- packages/autokey/trunk/debian/patches/00list	2009-12-23 20:32:33 UTC (rev 4353)
+++ packages/autokey/trunk/debian/patches/00list	2009-12-23 20:35:14 UTC (rev 4354)
@@ -1 +0,0 @@
-1000-daemon-fix.dpatch

Deleted: packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch
===================================================================
--- packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch	2009-12-23 20:32:33 UTC (rev 4353)
+++ packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch	2009-12-23 20:35:14 UTC (rev 4354)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 1000-daemon-fix.dpatch by  <luke at faraone.cc>
-##
-
-## From: Luke Faraone <luke at faraone.cc>
-## Description: Check error codes rather than error strings.
-## Bug: http://code.google.com/p/autokey/issues/detail?id=17
-
- at DPATCH@
-diff -urNad trunk~/src/lib/daemon.py trunk/src/lib/daemon.py
---- trunk~/src/lib/daemon.py	2009-07-03 23:50:07.000000000 -0400
-+++ trunk/src/lib/daemon.py	2009-12-06 14:26:20.369707310 -0500
-@@ -107,8 +107,7 @@
- 				os.kill(pid, SIGTERM)
- 				time.sleep(0.1)
- 		except OSError, err:
--			err = str(err)
--			if err.find("No such process") > 0:
-+			if err.errno == 3:
- 				if os.path.exists(self.pidfile):
- 					os.remove(self.pidfile)
- 			else: