[gentoo-commits] portage r11510 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-09-13 18:10:15 +0000 (Sat, 13 Sep 2008)
New Revision: 11510

Modified:
   main/trunk/pym/portage/news.py
Log:
Bug #237526 - Use portage.util.grablines() for exception handling when
reading the unread file.


Modified: main/trunk/pym/portage/news.py
===================================================================
--- main/trunk/pym/portage/news.py	2008-09-13 17:38:40 UTC (rev 11509)
+++ main/trunk/pym/portage/news.py	2008-09-13 18:10:15 UTC (rev 11510)
@@ -10,7 +10,8 @@
 import errno
 import os
 import re
-from portage.util import ensure_dirs, apply_permissions, normalize_path, grabfile, write_atomic
+from portage.util import apply_permissions, ensure_dirs, grabfile, \
+	grablines, normalize_path, write_atomic
 from portage.data import portage_gid
 from portage.locks import lockfile, unlockfile
 from portage.exception import OperationNotPermitted
@@ -141,19 +142,9 @@
 			if os.access(os.path.dirname(unreadfile), os.W_OK):
 				# TODO: implement shared readonly locks
 				unread_lock = lockfile(unreadfile)
-			try:
-				f = open(unreadfile)
-				try:
-					unread = f.readlines()
-				finally:
-					f.close()
-			except EnvironmentError, e:
-				if e.errno != errno.ENOENT:
-					raise
-				del e
-				return 0
-			if len(unread):
-				return len(unread)
+
+			return len(grablines(unreadfile))
+
 		finally:
 			if unread_lock:
 				unlockfile(unread_lock)