From 4ecca529eb6de9fe55b6fd91fe8273685f9fc314 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 13 Nov 2008 02:00:38 +0000 Subject: [PATCH] Return early from NewsManager.updateItems() if the news path listdir call fails. svn path=/main/trunk/; revision=11869 --- pym/portage/news.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pym/portage/news.py b/pym/portage/news.py index 332e05dc1..39589b55d 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -73,12 +73,10 @@ class NewsManager(object): raise ValueError("Invalid repoID: %s" % repoid) path = os.path.join(self.portdb.getRepositoryPath(repoid), self.news_path) - - # Skip reading news for repoid if the news dir does not exist. Requested by - # NightMorph :) - if not os.path.exists(path): - return None - news = os.listdir(path) + try: + news = os.listdir(path) + except OSError: + return skipfile = os.path.join(self.unread_path, "news-%s.skip" % repoid) skiplist = set(grabfile(skipfile)) -- 2.26.2