1 |
commit: 399ec5c64ac6a341b7db169709b35682656abc3d |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 17 00:42:29 2014 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Sep 30 00:42:26 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=399ec5c6 |
7 |
|
8 |
sync/syncbase.py: Fix the self.has_bin logic |
9 |
|
10 |
--- |
11 |
pym/portage/sync/syncbase.py | 22 ++++++++++++---------- |
12 |
1 file changed, 12 insertions(+), 10 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/sync/syncbase.py b/pym/portage/sync/syncbase.py |
15 |
index 2b6b8c7..94d4aab 100644 |
16 |
--- a/pym/portage/sync/syncbase.py |
17 |
+++ b/pym/portage/sync/syncbase.py |
18 |
@@ -34,16 +34,18 @@ class SyncBase(object): |
19 |
self.repo = None |
20 |
self.xterm_titles = None |
21 |
self.spawn_kwargs = None |
22 |
- self.bin_command = portage.process.find_binary(bin_command) |
23 |
- |
24 |
- self.has_bin = True |
25 |
- if bin_command and self.bin_command is None: |
26 |
- msg = ["Command not found: %s" % bin_command, |
27 |
- "Type \"emerge %s\" to enable %s support." % (bin_pkg, bin_command)] |
28 |
- for l in msg: |
29 |
- writemsg_level("!!! %s\n" % l, |
30 |
- level=self.logger.ERROR, noiselevel=-1) |
31 |
- self.has_bin = False |
32 |
+ self.bin_command = None |
33 |
+ self.has_bin = False |
34 |
+ if bin_command: |
35 |
+ self.bin_command = portage.process.find_binary(bin_command) |
36 |
+ if self.bin_command is None: |
37 |
+ msg = ["Command not found: %s" % bin_command, |
38 |
+ "Type \"emerge %s\" to enable %s support." % (bin_pkg, bin_command)] |
39 |
+ for l in msg: |
40 |
+ writemsg_level("!!! %s\n" % l, |
41 |
+ level=self.logger.ERROR, noiselevel=-1) |
42 |
+ else: |
43 |
+ self.has_bin = True |
44 |
|
45 |
|
46 |
def _kwargs(self, kwargs): |