[26775] in Source-Commits
/svn/athena r25745 - in trunk/athena/bin/athinfo: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 29 17:31:07 2012
Date: Wed, 29 Aug 2012 17:31:06 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208292131.q7TLV6Mx028162@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-29 17:31:05 -0400 (Wed, 29 Aug 2012)
New Revision: 25745
Modified:
trunk/athena/bin/athinfo/athinfo
trunk/athena/bin/athinfo/debian/changelog
trunk/athena/bin/athinfo/debian/control.in
Log:
In athinfo:
* Catch IOErrors (Trac #1214)
* Use .writelines() instead of .write() with .read()
* Bump Standards-Version
Modified: trunk/athena/bin/athinfo/athinfo
===================================================================
--- trunk/athena/bin/athinfo/athinfo 2012-08-29 20:46:43 UTC (rev 25744)
+++ trunk/athena/bin/athinfo/athinfo 2012-08-29 21:31:05 UTC (rev 25745)
@@ -51,10 +51,13 @@
s.connect((host_addr, port))
s.sendall('%s\n' % query)
- sys.stdout.write(s.makefile().read())
+ sys.stdout.writelines(s.makefile())
except socket.error, e:
print >>sys.stderr, 'athinfo: %s' % e.args[-1]
return 1
+ except IOError, e:
+ print >>sys.stderr, 'athinfo: %s' % e.args[-1]
+ return 1
except KeyboardInterrupt:
return 1
Modified: trunk/athena/bin/athinfo/debian/changelog
===================================================================
--- trunk/athena/bin/athinfo/debian/changelog 2012-08-29 20:46:43 UTC (rev 25744)
+++ trunk/athena/bin/athinfo/debian/changelog 2012-08-29 21:31:05 UTC (rev 25745)
@@ -1,3 +1,11 @@
+debathena-athinfo (10.1-0debathena1) unstable; urgency=low
+
+ * Catch IOErrors (Trac #1214)
+ * Use .writelines() instead of .write() with .read()
+ * Bump Standards-Version
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 29 Aug 2012 17:31:00 -0400
+
debathena-athinfo (10.0.3-0debathena1) unstable; urgency=low
* Rewrite in Python.
Modified: trunk/athena/bin/athinfo/debian/control.in
===================================================================
--- trunk/athena/bin/athinfo/debian/control.in 2012-08-29 20:46:43 UTC (rev 25744)
+++ trunk/athena/bin/athinfo/debian/control.in 2012-08-29 21:31:05 UTC (rev 25745)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Package: debathena-athinfo
Architecture: all
