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

[nijel at users.alioth.debian.org]

    Date: Tuesday, December 16, 2008 @ 08:19:20
  Author: nijel
Revision: 2081

RemovePID patch si not needed anymore, fixed upstream different way.

Modified:
  packages/pyicqt/trunk/debian/changelog
  packages/pyicqt/trunk/debian/patches/series
Deleted:
  packages/pyicqt/trunk/debian/patches/remove_pid.patch

Modified: packages/pyicqt/trunk/debian/changelog
===================================================================
--- packages/pyicqt/trunk/debian/changelog	2008-12-15 13:51:52 UTC (rev 2080)
+++ packages/pyicqt/trunk/debian/changelog	2008-12-16 08:19:20 UTC (rev 2081)
@@ -1,8 +1,9 @@
 pyicqt (0.8.1final-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * RemovePID patch si not needed anymore, fixed upstream different way.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 14 Dec 2008 14:29:47 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 16 Dec 2008 09:18:34 +0100
 
 pyicqt (0.8.1final-1) experimental; urgency=low
 

Deleted: packages/pyicqt/trunk/debian/patches/remove_pid.patch
===================================================================
--- packages/pyicqt/trunk/debian/patches/remove_pid.patch	2008-12-15 13:51:52 UTC (rev 2080)
+++ packages/pyicqt/trunk/debian/patches/remove_pid.patch	2008-12-16 08:19:20 UTC (rev 2081)
@@ -1,31 +0,0 @@
-Reimplement removePID, it seems to be missing in current twisted.
-http://code.google.com/p/pyicqt/issues/detail?id=140
-
---- a/src/main.py
-+++ b/src/main.py
-@@ -448,12 +448,24 @@
- 		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.sendMessagesOnShutdown()
- 		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)

Modified: packages/pyicqt/trunk/debian/patches/series
===================================================================
--- packages/pyicqt/trunk/debian/patches/series	2008-12-15 13:51:52 UTC (rev 2080)
+++ packages/pyicqt/trunk/debian/patches/series	2008-12-16 08:19:20 UTC (rev 2081)
@@ -1,4 +1,3 @@
 header-dont-use-env.patch
 adapt-default-config-options.patch
 failure-report.patch
-remove_pid.patch