[Python-apps-commits] r1521 - in packages/pyicqt/trunk/debian (3 files)

[nijel at users.alioth.debian.org]

    Date: Sunday, July 6, 2008 @ 21:23:10
  Author: nijel
Revision: 1521

Reimplement missing removePID (Closes: #489311).

Added:
  packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch
Modified:
  packages/pyicqt/trunk/debian/changelog
  packages/pyicqt/trunk/debian/patches/00list

Modified: packages/pyicqt/trunk/debian/changelog
===================================================================
--- packages/pyicqt/trunk/debian/changelog	2008-07-06 20:59:11 UTC (rev 1520)
+++ packages/pyicqt/trunk/debian/changelog	2008-07-06 21:23:10 UTC (rev 1521)
@@ -1,8 +1,8 @@
-pyicqt (0.8b-5) UNRELEASED; urgency=low
+pyicqt (0.8b-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Reimplement missing removePID (Closes: #489311).
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sat, 07 Jun 2008 12:39:09 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 06 Jul 2008 23:23:02 +0200
 
 pyicqt (0.8b-4) unstable; urgency=low
 

Modified: packages/pyicqt/trunk/debian/patches/00list
===================================================================
--- packages/pyicqt/trunk/debian/patches/00list	2008-07-06 20:59:11 UTC (rev 1520)
+++ packages/pyicqt/trunk/debian/patches/00list	2008-07-06 21:23:10 UTC (rev 1521)
@@ -1,3 +1,4 @@
 01_header-dont-use-env
 02_adapt-default-config-options
 05_failure-report
+06_remove_pid

Added: packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch
===================================================================
--- packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch	                        (rev 0)
+++ packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch	2008-07-06 21:23:10 UTC (rev 1521)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_remove_pid.dpatch by Michal ÄŒihaÅ™ <nijel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Reimplement removePID, it seems to be missing in current twisted.
+
+ at DPATCH@
+diff -urNad pyicqt-0.8b~/src/main.py pyicqt-0.8b/src/main.py
+--- pyicqt-0.8b~/src/main.py	2008-01-06 13:14:51.000000000 +0100
++++ pyicqt-0.8b/src/main.py	2008-07-06 23:18:24.000000000 +0200
+@@ -430,11 +430,23 @@
+ 		pf.write("%s\n" % pid)
+ 		pf.close()
+ 
++	def removePID(self):
++		try:
++			os.unlink(config.pid)
++		except OSError, e:
++			if e.errno == errno.EACCES or e.errno == errno.EPERM:
++				print "Warning: No permission to delete pid file"
++			else:
++				print "Failed to unlink PID file:"
++				print e
++		except:
++			print "Failed to unlink PID file"
++
+ 	def shuttingDown(self):
+ 		self.transportSvc.removeMe()
+ 		def cb(ignored=None):
+ 			if config.pid:
+-				twistd.removePID(config.pid)
++				self.removePID()
+ 		d = Deferred()
+ 		d.addCallback(cb)
+ 		reactor.callLater(3.0, d.callback, None)


Property changes on: packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch
___________________________________________________________________
Name: svn:executable
   + *