[hipl-dev] [Merge] lp:~ptman/hipl/bug-986383 into lp:hipl
- From: Paul Tötterman <ptman@xxxxxx>
- To: mp+103973@xxxxxxxxxxxxxxxxxx
- Date: Sat, 28 Apr 2012 09:30:24 -0000
Paul Tötterman has proposed merging lp:~ptman/hipl/bug-986383 into lp:hipl.
Requested reviews:
HIPL core team (hipl-core)
Related bugs:
Bug #986383 in HIPL: "DNS proxy fails to recover /etc/resolv.conf"
https://bugs.launchpad.net/hipl/+bug/986383
For more details, see:
https://code.launchpad.net/~ptman/hipl/bug-986383/+merge/103973
Fixes https://bugs.launchpad.net/hipl/+bug/986383
Tested that the bug is actually fixed. Also confirmed that basic DNS resolving
remains unaffected.
--
https://code.launchpad.net/~ptman/hipl/bug-986383/+merge/103973
Your team HIPL core team is requested to review the proposed merge of
lp:~ptman/hipl/bug-986383 into lp:hipl.
=== 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:29:19 +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:
