Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/emaint/modules/sync/
Date: Mon, 29 Sep 2014 18:29:44
Message-Id: 1412011221.ff34d37193745e915b9213d72c0be4d5e0eeec80.dol-sen@gentoo
1 commit: ff34d37193745e915b9213d72c0be4d5e0eeec80
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 5 04:28:16 2014 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Mon Sep 29 17:20:21 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ff34d371
7
8 emaint sync: migrate print staements to emaint style messages
9
10 Comment out some debug prints.
11
12 ---
13 pym/portage/emaint/modules/sync/sync.py | 62 +++++++++++++++++++--------------
14 1 file changed, 36 insertions(+), 26 deletions(-)
15
16 diff --git a/pym/portage/emaint/modules/sync/sync.py b/pym/portage/emaint/modules/sync/sync.py
17 index ab7591d..b657133 100644
18 --- a/pym/portage/emaint/modules/sync/sync.py
19 +++ b/pym/portage/emaint/modules/sync/sync.py
20 @@ -70,20 +70,22 @@ class SyncRepos(object):
21 '''Sync auto-sync enabled repos'''
22 options = kwargs.get('options', None)
23 selected = self._get_repos(True)
24 - if options.get('return-messages', False):
25 - return self.rmessage(self._sync(selected), 'sync')
26 - return self._sync(selected)
27 + if options:
28 + return_messages = options.get('return-messages', False)
29 + else:
30 + return_messages = False
31 + return self._sync(selected, return_messages)
32
33
34 def all_repos(self, **kwargs):
35 '''Sync all repos defined in repos.conf'''
36 selected = self._get_repos(auto_sync_only=False)
37 options = kwargs.get('options', None)
38 - if options.get('return-messages', False):
39 - return self.rmessage(
40 - self._sync(selected),
41 - 'sync')
42 - return self._sync(selected)
43 + if options:
44 + return_messages = options.get('return-messages', False)
45 + else:
46 + return_messages = False
47 + return self._sync(selected, return_messages)
48
49
50 def repo(self, **kwargs):
51 @@ -98,9 +100,7 @@ class SyncRepos(object):
52 repos = repos.split()
53 available = self._get_repos(auto_sync_only=False)
54 selected = self._match_repos(repos, available)
55 - if return_messages:
56 - return self.rmessage(self._sync(selected), 'sync')
57 - return self._sync(selected)
58 + return self._sync(selected, return_messages)
59
60
61 @staticmethod
62 @@ -124,7 +124,7 @@ class SyncRepos(object):
63 missing_sync_type = []
64 if self.emerge_config.args:
65 for repo_name in self.emerge_config.args:
66 - print("_get_repos(): repo_name =", repo_name)
67 + #print("_get_repos(): repo_name =", repo_name)
68 try:
69 repo = self.emerge_config.target_config.settings.repositories[repo_name]
70 except KeyError:
71 @@ -146,7 +146,8 @@ class SyncRepos(object):
72 level=logging.ERROR, noiselevel=-1)
73
74 if unknown_repo_names or missing_sync_type:
75 - print("missing or unknown repos... returning")
76 + writemsg_level("Missing or unknown repos... returning",
77 + level=logging.INFO, noiselevel=2)
78 return []
79
80 else:
81 @@ -165,17 +166,20 @@ class SyncRepos(object):
82 return selected
83
84
85 - def _sync(self, selected_repos):
86 + def _sync(self, selected_repos, return_messages):
87 + msgs = []
88 if not selected_repos:
89 - print("_sync(), nothing to sync... returning")
90 - return [('None', os.EX_OK)]
91 + msgs.append("Emaint sync, nothing to sync... returning")
92 + if return_messages:
93 + return msgs.append(self.rmessage(('None', os.EX_OK), 'sync'))
94 + return
95 # Portage needs to ensure a sane umask for the files it creates.
96 os.umask(0o22)
97
98 sync_manager = get_syncer(self.emerge_config.target_config.settings, emergelog)
99 retvals = []
100 for repo in selected_repos:
101 - print("syncing repo:", repo.name)
102 + #print("syncing repo:", repo.name)
103 if repo.sync_type is not None:
104 returncode = sync_manager.sync(self.emerge_config, repo)
105 #if returncode != os.EX_OK:
106 @@ -185,12 +189,16 @@ class SyncRepos(object):
107 portage._sync_mode = False
108 self._reload_config()
109 self._do_pkg_moves()
110 - self._check_updates()
111 + msgs.extend(self._check_updates())
112 display_news_notification(self.emerge_config.target_config,
113 self.emerge_config.opts)
114 if retvals:
115 - return retvals
116 - return [('None', os.EX_OK)]
117 + msgs.extend(self.rmessage(retvals, 'sync'))
118 + else:
119 + msgs.append(self.rmessage(('None', os.EX_OK), 'sync'))
120 + if return_messages:
121 + return msgs
122 + return
123
124
125 def _do_pkg_moves(self):
126 @@ -214,13 +222,15 @@ class SyncRepos(object):
127 portage.util.shlex_split(
128 self.emerge_config.target_config.settings.get("CONFIG_PROTECT", "")))
129
130 + msgs = []
131 if mybestpv != mypvs and "--quiet" not in self.emerge_config.opts:
132 - print()
133 - print(warn(" * ")+bold("An update to portage is available.")+" It is _highly_ recommended")
134 - print(warn(" * ")+"that you update portage now, before any other packages are updated.")
135 - print()
136 - print(warn(" * ")+"To update portage, run 'emerge --oneshot portage' now.")
137 - print()
138 + msgs.append('')
139 + msgs.append(warn(" * ")+bold("An update to portage is available.")+" It is _highly_ recommended")
140 + msgs.append(warn(" * ")+"that you update portage now, before any other packages are updated.")
141 + msgs.append('')
142 + msgs.append(warn(" * ")+"To update portage, run 'emerge --oneshot portage' now.")
143 + msgs.append('')
144 + return msgs
145
146
147 def _reload_config(self):