1 |
On Thu, 20 Aug 2015 17:02:34 -0700 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Execute the hooks immediately after all repos have synced. |
5 |
> |
6 |
> X-Gentoo-Bug: 558322 |
7 |
> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=558322 |
8 |
> --- |
9 |
> pym/portage/emaint/modules/sync/sync.py | 16 +++++++++------- |
10 |
> 1 file changed, 9 insertions(+), 7 deletions(-) |
11 |
> |
12 |
> diff --git a/pym/portage/emaint/modules/sync/sync.py |
13 |
> b/pym/portage/emaint/modules/sync/sync.py index 601118f..57c779d |
14 |
> 100644 --- a/pym/portage/emaint/modules/sync/sync.py |
15 |
> +++ b/pym/portage/emaint/modules/sync/sync.py |
16 |
> @@ -233,13 +233,6 @@ class SyncRepos(object): |
17 |
> retvals = sync_scheduler.retvals |
18 |
> msgs.extend(sync_scheduler.msgs) |
19 |
> |
20 |
> - # Reload the whole config. |
21 |
> - portage._sync_mode = False |
22 |
> - self._reload_config() |
23 |
> - self._do_pkg_moves() |
24 |
> - msgs.extend(self._check_updates()) |
25 |
> - |
26 |
> display_news_notification(self.emerge_config.target_config, |
27 |
> - self.emerge_config.opts) |
28 |
> # run the post_sync_hook one last time for |
29 |
> # run only at sync completion hooks |
30 |
> rcode = sync_manager.perform_post_sync_hook('') |
31 |
> @@ -249,6 +242,15 @@ class SyncRepos(object): |
32 |
> msgs.extend(self.rmessage([('None', |
33 |
> os.EX_OK)], 'sync')) if rcode: |
34 |
> msgs.extend(self.rmessage([('None', rcode)], |
35 |
> 'post-sync')) + |
36 |
> + # Reload the whole config. |
37 |
> + portage._sync_mode = False |
38 |
> + self._reload_config() |
39 |
> + self._do_pkg_moves() |
40 |
> + msgs.extend(self._check_updates()) |
41 |
> + |
42 |
> display_news_notification(self.emerge_config.target_config, |
43 |
> + self.emerge_config.opts) |
44 |
> + |
45 |
> if return_messages: |
46 |
> return msgs |
47 |
> return |
48 |
|
49 |
looks good :) |
50 |
|
51 |
-- |
52 |
Brian Dolbec <dolsen> |