1 |
Make this easier to read by avoiding nested conditionals [1]. |
2 |
|
3 |
[1]: http://article.gmane.org/gmane.linux.gentoo.portage.devel/4058 |
4 |
|
5 |
Reported-by: Tom Wijsman <TomWij@g.o> |
6 |
--- |
7 |
pym/portage/package/ebuild/fetch.py | 30 ++++++++++++++---------------- |
8 |
1 file changed, 14 insertions(+), 16 deletions(-) |
9 |
|
10 |
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py |
11 |
index 0093a6e..2bf88d8 100644 |
12 |
--- a/pym/portage/package/ebuild/fetch.py |
13 |
+++ b/pym/portage/package/ebuild/fetch.py |
14 |
@@ -276,24 +276,22 @@ def _get_checksum_failure_max_tries(settings, default=5): |
15 |
|
16 |
def _get_fetch_resume_size(settings, default='350K'): |
17 |
key = 'PORTAGE_FETCH_RESUME_MIN_SIZE' |
18 |
- v = settings.get(key) |
19 |
+ v = settings.get(key, default) |
20 |
if v is not None: |
21 |
v = "".join(v.split()) |
22 |
- if not v: |
23 |
- # If it's empty, silently use the default. |
24 |
- v = default |
25 |
- match = _fetch_resume_size_re.match(v) |
26 |
- if (match is None or |
27 |
- match.group(2).upper() not in _size_suffix_map): |
28 |
- writemsg(_("!!! Variable %s contains an " |
29 |
- "unrecognized format: '%s'\n") |
30 |
- % (key, settings[key]), |
31 |
- noiselevel=-1) |
32 |
- writemsg(_("!!! Using %s default value: %s\n") |
33 |
- % (key, default), |
34 |
- noiselevel=-1) |
35 |
- v = None |
36 |
- if v is None: |
37 |
+ if not v: |
38 |
+ # If it's empty, silently use the default. |
39 |
+ v = default |
40 |
+ match = _fetch_resume_size_re.match(v) |
41 |
+ if (match is None or |
42 |
+ match.group(2).upper() not in _size_suffix_map): |
43 |
+ writemsg(_("!!! Variable %s contains " |
44 |
+ "an unrecognized format: '%s'\n") |
45 |
+ % (key, settings[key]), |
46 |
+ noiselevel=-1) |
47 |
+ writemsg(_("!!! Using %s default value: %s\n") |
48 |
+ % (key, default), |
49 |
+ noiselevel=-1) |
50 |
v = default |
51 |
match = _fetch_resume_size_re.match(v) |
52 |
v = int(match.group(1)) * \ |
53 |
-- |
54 |
1.8.5.2.8.g0f6c0d1 |