Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] SyncRepos._sync: call postsync.d hooks earlier (bug 558322)
Date: Fri, 21 Aug 2015 00:03:05
Message-Id: 1440115354-32384-1-git-send-email-zmedico@gentoo.org
1 Execute the hooks immediately after all repos have synced.
2
3 X-Gentoo-Bug: 558322
4 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=558322
5 ---
6 pym/portage/emaint/modules/sync/sync.py | 16 +++++++++-------
7 1 file changed, 9 insertions(+), 7 deletions(-)
8
9 diff --git a/pym/portage/emaint/modules/sync/sync.py b/pym/portage/emaint/modules/sync/sync.py
10 index 601118f..57c779d 100644
11 --- a/pym/portage/emaint/modules/sync/sync.py
12 +++ b/pym/portage/emaint/modules/sync/sync.py
13 @@ -233,13 +233,6 @@ class SyncRepos(object):
14 retvals = sync_scheduler.retvals
15 msgs.extend(sync_scheduler.msgs)
16
17 - # Reload the whole config.
18 - portage._sync_mode = False
19 - self._reload_config()
20 - self._do_pkg_moves()
21 - msgs.extend(self._check_updates())
22 - display_news_notification(self.emerge_config.target_config,
23 - self.emerge_config.opts)
24 # run the post_sync_hook one last time for
25 # run only at sync completion hooks
26 rcode = sync_manager.perform_post_sync_hook('')
27 @@ -249,6 +242,15 @@ class SyncRepos(object):
28 msgs.extend(self.rmessage([('None', os.EX_OK)], 'sync'))
29 if rcode:
30 msgs.extend(self.rmessage([('None', rcode)], 'post-sync'))
31 +
32 + # Reload the whole config.
33 + portage._sync_mode = False
34 + self._reload_config()
35 + self._do_pkg_moves()
36 + msgs.extend(self._check_updates())
37 + display_news_notification(self.emerge_config.target_config,
38 + self.emerge_config.opts)
39 +
40 if return_messages:
41 return msgs
42 return
43 --
44 2.4.6

Replies