diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-20 16:52:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 12:15:30 +0100 |
| commit | 48619958d53cbec888a0a6806c5e494291e9e227 (patch) | |
| tree | 0618ff69a32566be156b0f7e5d7a06cce350e033 /meta/classes/update-alternatives.bbclass | |
| parent | 7c40daab587306da25c8d8f566392ee1f57bbef4 (diff) | |
| download | poky-48619958d53cbec888a0a6806c5e494291e9e227.tar.gz | |
meta/classes: Various python whitespace fixes
It was pointed out we have a number of weird indentations in the python functions.
This patch cleans up 3, 7 and other weird indentations for the core bbclass files.
It also fixes some wierd (odd) shell function indentation which my searches picked up.
(From OE-Core rev: 8385d6d74624000d68814f4e3266d47bc8885942)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-alternatives.bbclass')
| -rw-r--r-- | meta/classes/update-alternatives.bbclass | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 47215add1e..4e1ff27052 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass | |||
| @@ -150,22 +150,22 @@ def update_alternatives_after_parse(d): | |||
| 150 | UPDALTVARS = "ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY" | 150 | UPDALTVARS = "ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY" |
| 151 | 151 | ||
| 152 | def gen_updatealternativesvardeps(d): | 152 | def gen_updatealternativesvardeps(d): |
| 153 | pkgs = (d.getVar("PACKAGES", True) or "").split() | 153 | pkgs = (d.getVar("PACKAGES", True) or "").split() |
| 154 | vars = (d.getVar("UPDALTVARS", True) or "").split() | 154 | vars = (d.getVar("UPDALTVARS", True) or "").split() |
| 155 | 155 | ||
| 156 | # First compute them for non_pkg versions | 156 | # First compute them for non_pkg versions |
| 157 | for v in vars: | 157 | for v in vars: |
| 158 | for flag in (d.getVarFlags(v) or {}): | 158 | for flag in (d.getVarFlags(v) or {}): |
| 159 | if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": | ||
| 160 | continue | ||
| 161 | d.appendVar('%s_VARDEPS' % (v), ' %s:%s' % (flag, d.getVarFlag(v, flag, False))) | ||
| 162 | |||
| 163 | for p in pkgs: | ||
| 164 | for v in vars: | ||
| 165 | for flag in (d.getVarFlags("%s_%s" % (v,p)) or {}): | ||
| 166 | if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": | 159 | if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": |
| 167 | continue | 160 | continue |
| 168 | d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False))) | 161 | d.appendVar('%s_VARDEPS' % (v), ' %s:%s' % (flag, d.getVarFlag(v, flag, False))) |
| 162 | |||
| 163 | for p in pkgs: | ||
| 164 | for v in vars: | ||
| 165 | for flag in (d.getVarFlags("%s_%s" % (v,p)) or {}): | ||
| 166 | if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": | ||
| 167 | continue | ||
| 168 | d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False))) | ||
| 169 | 169 | ||
| 170 | python __anonymous() { | 170 | python __anonymous() { |
| 171 | # deprecated stuff... | 171 | # deprecated stuff... |
| @@ -176,18 +176,18 @@ python __anonymous() { | |||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | def gen_updatealternativesvars(d): | 178 | def gen_updatealternativesvars(d): |
| 179 | ret = [] | 179 | ret = [] |
| 180 | pkgs = (d.getVar("PACKAGES", True) or "").split() | 180 | pkgs = (d.getVar("PACKAGES", True) or "").split() |
| 181 | vars = (d.getVar("UPDALTVARS", True) or "").split() | 181 | vars = (d.getVar("UPDALTVARS", True) or "").split() |
| 182 | 182 | ||
| 183 | for v in vars: | 183 | for v in vars: |
| 184 | ret.append(v + "_VARDEPS") | 184 | ret.append(v + "_VARDEPS") |
| 185 | 185 | ||
| 186 | for p in pkgs: | 186 | for p in pkgs: |
| 187 | for v in vars: | 187 | for v in vars: |
| 188 | ret.append(v + "_" + p) | 188 | ret.append(v + "_" + p) |
| 189 | ret.append(v + "_VARDEPS_" + p) | 189 | ret.append(v + "_VARDEPS_" + p) |
| 190 | return " ".join(ret) | 190 | return " ".join(ret) |
| 191 | 191 | ||
| 192 | # First the deprecated items... | 192 | # First the deprecated items... |
| 193 | populate_packages[vardeps] += "ALTERNATIVE_LINKS ALTERNATIVE_NAME ALTERNATIVE_PATH" | 193 | populate_packages[vardeps] += "ALTERNATIVE_LINKS ALTERNATIVE_NAME ALTERNATIVE_PATH" |
