diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-15 22:17:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-15 22:17:01 +0000 |
| commit | fcf54e8c78dd053e4b946c252b0d478ded4e783c (patch) | |
| tree | 165b1717baddc3b0c84b0cc06642d28cd73efb08 | |
| parent | ddf4474a32cf924681e69fbfdc263af493b9da9a (diff) | |
| download | portage-fcf54e8c78dd053e4b946c252b0d478ded4e783c.tar.gz portage-fcf54e8c78dd053e4b946c252b0d478ded4e783c.tar.bz2 portage-fcf54e8c78dd053e4b946c252b0d478ded4e783c.zip | |
Make NewsManager.updateItems() and getUnreadItems() return early if
PermissionDenied errors are encountered when attempting to read the
skip or unread files.
svn path=/main/branches/2.1.6/; revision=11957
| -rw-r--r-- | pym/portage/news.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pym/portage/news.py b/pym/portage/news.py index aa979dabd..90dd3a065 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -100,10 +100,13 @@ class NewsManager(object): unread_filename = self._unread_filename(repoid) unread_lock = lockfile(unread_filename, wantnewlockfile=1) try: - unread = set(grabfile(unread_filename)) - unread_orig = unread.copy() - skip = set(grabfile(skip_filename)) - skip_orig = skip.copy() + try: + unread = set(grabfile(unread_filename)) + unread_orig = unread.copy() + skip = set(grabfile(skip_filename)) + skip_orig = skip.copy() + except PermissionDenied: + return updates = [] for itemid in news: @@ -156,7 +159,10 @@ class NewsManager(object): except (InvalidLocation, OperationNotPermitted, PermissionDenied): return 0 try: - return len(grabfile(unread_filename)) + try: + return len(grabfile(unread_filename)) + except PermissionDenied: + return 0 finally: if unread_lock: unlockfile(unread_lock) |