[Python-apps-commits] r1522 - in packages/pyaimt/trunk/debian (3 files)
nijel at users.alioth.debian.org
nijel at users.alioth.debian.org
Sun Jul 6 21:25:23 UTC 2008
Date: Sunday, July 6, 2008 @ 21:25:21
Author: nijel
Revision: 1522
Reimplement missing removePID (Closes: #489308).
Added:
packages/pyaimt/trunk/debian/patches/06_remove_pid.dpatch
Modified:
packages/pyaimt/trunk/debian/changelog
packages/pyaimt/trunk/debian/patches/00list
Modified: packages/pyaimt/trunk/debian/changelog
===================================================================
--- packages/pyaimt/trunk/debian/changelog 2008-07-06 21:23:10 UTC (rev 1521)
+++ packages/pyaimt/trunk/debian/changelog 2008-07-06 21:25:21 UTC (rev 1522)
@@ -1,8 +1,8 @@
-pyaimt (0.8a-7) UNRELEASED; urgency=low
+pyaimt (0.8a-7) unstable; urgency=low
- * NOT RELEASED YET
+ * Reimplement missing removePID (Closes: #489308).
- -- Michal ÄihaÅ <nijel at debian.org> Tue, 27 May 2008 14:20:35 +0200
+ -- Michal ÄihaÅ <nijel at debian.org> Sun, 06 Jul 2008 23:24:52 +0200
pyaimt (0.8a-6) unstable; urgency=low
Modified: packages/pyaimt/trunk/debian/patches/00list
===================================================================
--- packages/pyaimt/trunk/debian/patches/00list 2008-07-06 21:23:10 UTC (rev 1521)
+++ packages/pyaimt/trunk/debian/patches/00list 2008-07-06 21:25:21 UTC (rev 1522)
@@ -3,3 +3,4 @@
03_pyicq20070823
04_fixups
05_failure-report
+06_remove_pid
Added: packages/pyaimt/trunk/debian/patches/06_remove_pid.dpatch
===================================================================
--- packages/pyaimt/trunk/debian/patches/06_remove_pid.dpatch (rev 0)
+++ packages/pyaimt/trunk/debian/patches/06_remove_pid.dpatch 2008-07-06 21:25:21 UTC (rev 1522)
@@ -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/pyaimt/trunk/debian/patches/06_remove_pid.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Python-apps-commits
mailing list