| 1 |
commit: 30e08cc1e869e0234aaacd56ed93242ba138b31d |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 25 11:22:34 2015 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 25 12:46:24 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=30e08cc1 |
| 7 |
|
| 8 |
scripts/gen_archlist: remove fix_nesting function |
| 9 |
|
| 10 |
Could not figure out if this was needed at all. At least it appears it |
| 11 |
is not useful anymore. Kill its weird logic with fire. |
| 12 |
|
| 13 |
scripts/gen_archlist.py | 21 +-------------------- |
| 14 |
1 file changed, 1 insertion(+), 20 deletions(-) |
| 15 |
|
| 16 |
diff --git a/scripts/gen_archlist.py b/scripts/gen_archlist.py |
| 17 |
index f2a68e5..659c84e 100755 |
| 18 |
--- a/scripts/gen_archlist.py |
| 19 |
+++ b/scripts/gen_archlist.py |
| 20 |
@@ -347,25 +347,6 @@ def gen_cpv_kws(cpv, kws_aim, depgraph, check_dependencies, new_release): |
| 21 |
return cpv_kw_list |
| 22 |
|
| 23 |
|
| 24 |
-def fix_nesting(nested_list): |
| 25 |
- """Takes a list of unknown nesting depth, and gives a nice list with each |
| 26 |
- element of the form [cpv, [kws]]""" |
| 27 |
- index = 0 |
| 28 |
- cpv_index = -1 |
| 29 |
- nice_list = [] |
| 30 |
- # Has an unpredictable nesting of lists; so we flatten it... |
| 31 |
- flat_list = portage.flatten(nested_list) |
| 32 |
- # ... and re-create a nice list for us to use |
| 33 |
- while index < len(flat_list): |
| 34 |
- if portage.catpkgsplit(flat_list[index]): |
| 35 |
- cpv_index += 1 |
| 36 |
- nice_list.append([flat_list[index], []]) |
| 37 |
- else: |
| 38 |
- nice_list[cpv_index][1].append(flat_list[index]) |
| 39 |
- index += 1 |
| 40 |
- return nice_list |
| 41 |
- |
| 42 |
- |
| 43 |
def consolidate_dupes(cpv_kws): |
| 44 |
""" |
| 45 |
Consolidate duplicate cpvs with differing keywords |
| 46 |
@@ -546,7 +527,7 @@ def main(): |
| 47 |
nothing_to_be_done(cpv) |
| 48 |
continue |
| 49 |
|
| 50 |
- ALL_CPV_KWS += fix_nesting( |
| 51 |
+ ALL_CPV_KWS.append( |
| 52 |
gen_cpv_kws(cpv, kws_missing, set([cpv]), |
| 53 |
args.check_dependencies, args.new_version) |
| 54 |
) |
Archives