[gentoo-commits] portage r12733 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-02-28 08:27:56 +0000 (Sat, 28 Feb 2009)
New Revision: 12733

Modified:
   main/trunk/bin/repoman
Log:
When checking ebuild content, use codecs.open() to force utf_8 encoding for
py3k compatibility (all ebuilds should have utf_8 encoding).


Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman	2009-02-28 05:43:29 UTC (rev 12732)
+++ main/trunk/bin/repoman	2009-02-28 08:27:56 UTC (rev 12733)
@@ -1444,14 +1444,18 @@
 		# Syntax Checks
 		relative_path = os.path.join(x, y + ".ebuild")
 		full_path = os.path.join(repodir, relative_path)
-		f = open(full_path)
 		try:
-			for check_name, e in run_checks(f, pkg):
-				stats[check_name] += 1
-				fails[check_name].append(relative_path + ': %s' % e)
-		finally:
-			f.close()
-			del f
+			# All ebuilds should have utf_8 encoding.
+			f = codecs.open(full_path, mode='r', encoding='utf_8')
+			try:
+				for check_name, e in run_checks(f, pkg):
+					stats[check_name] += 1
+					fails[check_name].append(relative_path + ': %s' % e)
+			finally:
+				f.close()
+		except UnicodeDecodeError:
+			# A file.UTF8 failure will have already been recorded above.
+			pass
 
 		if options.force:
 			# The dep_check() calls are the most expensive QA test. If --force