| 1 |
commit: e9aff636fa22ca91f47a3c5b0955e8e7baee5d6a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 2 23:11:45 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 23:11:45 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e9aff636 |
| 7 |
|
| 8 |
Atom: tweak indent for slot logic |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dep/__init__.py | 48 +++++++++++++++++++++--------------------- |
| 12 |
1 files changed, 24 insertions(+), 24 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py |
| 15 |
index c722e48..d71ec09 100644 |
| 16 |
--- a/pym/portage/dep/__init__.py |
| 17 |
+++ b/pym/portage/dep/__init__.py |
| 18 |
@@ -1430,12 +1430,12 @@ class Atom(_unicode): |
| 19 |
atom = remove_slot(self) |
| 20 |
if self.slot is not None or self.slot_abi_op is not None: |
| 21 |
atom += _slot_separator |
| 22 |
- if self.slot is not None: |
| 23 |
- atom += self.slot |
| 24 |
- if self.slot_abi is not None: |
| 25 |
- atom += "/%s" % self.slot_abi |
| 26 |
- if self.slot_abi_op is not None: |
| 27 |
- atom += self.slot_abi_op |
| 28 |
+ if self.slot is not None: |
| 29 |
+ atom += self.slot |
| 30 |
+ if self.slot_abi is not None: |
| 31 |
+ atom += "/%s" % self.slot_abi |
| 32 |
+ if self.slot_abi_op is not None: |
| 33 |
+ atom += self.slot_abi_op |
| 34 |
atom += _repo_separator + repo |
| 35 |
if self.use is not None: |
| 36 |
atom += _unicode(self.use) |
| 37 |
@@ -1497,12 +1497,12 @@ class Atom(_unicode): |
| 38 |
atom = remove_slot(self) |
| 39 |
if self.slot is not None or self.slot_abi_op is not None: |
| 40 |
atom += _slot_separator |
| 41 |
- if self.slot is not None: |
| 42 |
- atom += self.slot |
| 43 |
- if self.slot_abi is not None: |
| 44 |
- atom += "/%s" % self.slot_abi |
| 45 |
- if self.slot_abi_op is not None: |
| 46 |
- atom += self.slot_abi_op |
| 47 |
+ if self.slot is not None: |
| 48 |
+ atom += self.slot |
| 49 |
+ if self.slot_abi is not None: |
| 50 |
+ atom += "/%s" % self.slot_abi |
| 51 |
+ if self.slot_abi_op is not None: |
| 52 |
+ atom += self.slot_abi_op |
| 53 |
use_dep = self.use.evaluate_conditionals(use) |
| 54 |
atom += _unicode(use_dep) |
| 55 |
return Atom(atom, unevaluated_atom=self, allow_repo=(self.repo is not None), _use=use_dep) |
| 56 |
@@ -1525,12 +1525,12 @@ class Atom(_unicode): |
| 57 |
atom = remove_slot(self) |
| 58 |
if self.slot is not None or self.slot_abi_op is not None: |
| 59 |
atom += _slot_separator |
| 60 |
- if self.slot is not None: |
| 61 |
- atom += self.slot |
| 62 |
- if self.slot_abi is not None: |
| 63 |
- atom += "/%s" % self.slot_abi |
| 64 |
- if self.slot_abi_op is not None: |
| 65 |
- atom += self.slot_abi_op |
| 66 |
+ if self.slot is not None: |
| 67 |
+ atom += self.slot |
| 68 |
+ if self.slot_abi is not None: |
| 69 |
+ atom += "/%s" % self.slot_abi |
| 70 |
+ if self.slot_abi_op is not None: |
| 71 |
+ atom += self.slot_abi_op |
| 72 |
use_dep = self.use.violated_conditionals(other_use, is_valid_flag, parent_use) |
| 73 |
atom += _unicode(use_dep) |
| 74 |
return Atom(atom, unevaluated_atom=self, allow_repo=(self.repo is not None), _use=use_dep) |
| 75 |
@@ -1541,12 +1541,12 @@ class Atom(_unicode): |
| 76 |
atom = remove_slot(self) |
| 77 |
if self.slot is not None or self.slot_abi_op is not None: |
| 78 |
atom += _slot_separator |
| 79 |
- if self.slot is not None: |
| 80 |
- atom += self.slot |
| 81 |
- if self.slot_abi is not None: |
| 82 |
- atom += "/%s" % self.slot_abi |
| 83 |
- if self.slot_abi_op is not None: |
| 84 |
- atom += self.slot_abi_op |
| 85 |
+ if self.slot is not None: |
| 86 |
+ atom += self.slot |
| 87 |
+ if self.slot_abi is not None: |
| 88 |
+ atom += "/%s" % self.slot_abi |
| 89 |
+ if self.slot_abi_op is not None: |
| 90 |
+ atom += self.slot_abi_op |
| 91 |
use_dep = self.use._eval_qa_conditionals(use_mask, use_force) |
| 92 |
atom += _unicode(use_dep) |
| 93 |
return Atom(atom, unevaluated_atom=self, allow_repo=(self.repo is not None), _use=use_dep) |
Archives