# HG changeset patch
# User Norm Jacobs <Norm.Jacobs@Oracle.COM>
# Date 1300308442 25200
# Node ID 6fb20db3eee40a8894c76b6070b8e44aeefe26db
# Parent  6a7dd3a5aaf979e8d48b549ed3f512de9a15d156
7028115 userland-fetch fails to validate gd2 archive (fix bzip)

diff -r 6a7dd3a5aaf9 -r 6fb20db3eee4 tools/userland-fetch
--- a/tools/userland-fetch	Wed Mar 16 12:03:52 2011 -0700
+++ b/tools/userland-fetch	Wed Mar 16 13:47:22 2011 -0700
@@ -51,7 +51,12 @@
 		return False
 
 	while True:
-		block = file.read()
+		try:
+			block = file.read()
+		except IOError, err:
+			print str(err),
+			break
+
 		m.update(block)
 		if block == '':
 			break
@@ -77,7 +82,7 @@
 
 	try:
 		if expr_bz.match(filename):
-			file = bz2.BZFile(filename, 'r')
+			file = bz2.BZ2File(filename, 'r')
 		elif expr_gz.match(filename):
 			file = gzip.GzipFile(filename, 'r')
 		else: