From 0d1d2b8dccdd5ce9f99358fe842fb968a0423a25 Mon Sep 17 00:00:00 2001 From: Nicolas Porcel Date: Mon, 18 Sep 2017 01:29:27 +0200 Subject: Fix emerge --info when using webrsync (bug 630538) When calling retrieve_head from a SyncBase object, it is expected to raise a NotImplementedError. However, all classes that do not inherit from NewBase will raise an AttributeError which is not caught. Fixes: 0e1699ad6b3f ("emerge: Add head commit per repo to --info") --- pym/portage/sync/syncbase.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/sync/syncbase.py b/pym/portage/sync/syncbase.py index 05e4d69d4..43b667fb0 100644 --- a/pym/portage/sync/syncbase.py +++ b/pym/portage/sync/syncbase.py @@ -102,6 +102,10 @@ class SyncBase(object): paths.extend(_SUBMODULE_PATH_MAP[name]) return tuple(paths) + def retrieve_head(self, **kwargs): + '''Get information about the head commit''' + raise NotImplementedError + class NewBase(SyncBase): '''Subclasses Syncbase adding a new() and runs it @@ -133,7 +137,3 @@ class NewBase(SyncBase): '''Update existing repository ''' raise NotImplementedError - - def retrieve_head(self, **kwargs): - '''Get information about the head commit''' - raise NotImplementedError -- cgit v1.2.3-65-gdbad