[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 6380: Merge lp:~ptman/hipl/bug-986383

Merge authors:
  Paul Tötterman (ptman)
Related merge proposals:
  https://code.launchpad.net/~ptman/hipl/bug-986383/+merge/103973
  proposed by: Paul Tötterman (ptman)
  review: Approve - Miika Komu (miika-iki)
------------------------------------------------------------
revno: 6380 [merge]
committer: Paul Tötterman <paul.totterman@xxxxxx>
branch nick: trunk
timestamp: Sat 2012-04-28 13:05:40 +0300
message:
  Merge lp:~ptman/hipl/bug-986383
modified:
  tools/hipdnsproxy/hipdnsproxy.in


--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk

Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to 
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'tools/hipdnsproxy/hipdnsproxy.in'
--- tools/hipdnsproxy/hipdnsproxy.in    2012-04-20 11:37:18 +0000
+++ tools/hipdnsproxy/hipdnsproxy.in    2012-04-28 09:15:20 +0000
@@ -373,8 +373,8 @@
         subprocess.check_call(['ifconfig', 'lo:53', 'down'])
         # Sometimes hipconf processes get stuck, particularly when
         # hipd is busy or unresponsive. This is a workaround.
-        subprocess.check_call(['killall', '--quiet', 'hipconf'],
-                              stderr=open(os.devnull, 'wb'))
+        subprocess.call(['killall', '--quiet', 'hipconf'],
+                        stderr=open(os.devnull, 'wb'))
 
 
 class DNSProxy:
@@ -1025,8 +1025,8 @@
                         if send_reply:
                             outbuf = Serialize(packet).get_packet()
                             servsock.sendto(outbuf, (query_o[1], query_o[2]))
-            except OSError, ose:
-                if ose[0] == errno.EINTR:
+            except (select.error, OSError), exc:
+                if exc[0] == errno.EINTR:
                     pass
                 else:
                     tbstr = traceback.format_exc()

Other related posts:

  • » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 6380: Merge lp:~ptman/hipl/bug-986383 - noreply