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

[nijel at users.alioth.debian.org]

    Date: Monday, August 24, 2009 @ 20:24:50
  Author: nijel
Revision: 3532

Oops removed wrong patch.

Added:
  packages/pyaimt/trunk/debian/patches/remove_pid.patch
Deleted:
  packages/pyaimt/trunk/debian/patches/fixups.patch

Deleted: packages/pyaimt/trunk/debian/patches/fixups.patch
===================================================================
--- packages/pyaimt/trunk/debian/patches/fixups.patch	2009-08-24 20:21:39 UTC (rev 3531)
+++ packages/pyaimt/trunk/debian/patches/fixups.patch	2009-08-24 20:24:50 UTC (rev 3532)
@@ -1,17 +0,0 @@
-Add missing function getvCardNotInList (stolen from PyICQ-t).
-
-diff -urNad pyaim-t-0.8a~/src/legacy/glue.py pyaim-t-0.8a/src/legacy/glue.py
---- pyaim-t-0.8a~/src/legacy/glue.py	2007-06-04 09:50:11.000000000 +0900
-+++ pyaim-t-0.8a/src/legacy/glue.py	2007-11-26 12:07:20.000000000 +0900
-@@ -523,6 +523,11 @@
- 		LogEvent(INFO, self.session.jabberID)
- 		#d.callback(vcard)
- 
-+	def getvCardNotInList(self, vcard, jid):
-+		LogEvent(DEBUG, "LegacyConnection: getvCardNotInList %s" % (jid))
-+		user = jid.split('@')[0]
-+		return icqt.ICQConnection.getvCard(self, vcard, user)
-+
- 	def getvCard(self, vcard, user):
- 		LogEvent(INFO, self.session.jabberID)
- 		try:

Added: packages/pyaimt/trunk/debian/patches/remove_pid.patch
===================================================================
--- packages/pyaimt/trunk/debian/patches/remove_pid.patch	                        (rev 0)
+++ packages/pyaimt/trunk/debian/patches/remove_pid.patch	2009-08-24 20:24:50 UTC (rev 3532)
@@ -0,0 +1,30 @@
+Reimplement removePID, it seems to be missing in current twisted.
+
+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)