jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

support/scripts: who's responsible to decide what is a package

Browse Source 
When generating the package lists, the responsibility to decide what is
actually a package symbol is currently split between the _is_package(),
the get_symbol_subset() and the format_asciidoc_table() functions.

The two latter functions check that an item is really a symbol, and that
is has a prompt.

While this is currently correct for real packages, this will no longer
be the case when we also generate a list of virtual packages, since they
do not have a prompt.

Move the responsibility to verify that a symbol is indeed a package symbol
to _is_package(), so it's all in one place, and makes it easier to change
for virtual packages.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-06-08 16:15:14 +02:00 committed by Thomas Petazzoni
parent f93edd823f
commit b2c75ecc5d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
support/scripts/gen-manual-lists.py
View File

@ -75,8 +75,6 @@ def get_symbol_subset(root, filter_func):
raise Exception(message) raise Exception(message)
for item in get_items(): for item in get_items():
if item.is_symbol(): if item.is_symbol():
if not item.prompts:
continue
if not filter_func(item): if not filter_func(item):
continue continue
yield item yield item
@ -134,8 +132,6 @@ def format_asciidoc_table(root, get_label_func, filter_func=lambda x: True,
return "| {0:<40}\n".format(item) return "| {0:<40}\n".format(item)
lines = [] lines = []
for item in get_symbol_subset(root, filter_func): for item in get_symbol_subset(root, filter_func):
if not item.is_symbol() or not item.prompts:
continue
loc = get_symbol_parents(item, root, enable_choice=enable_choice) loc = get_symbol_parents(item, root, enable_choice=enable_choice)
lines.append(_format_entry(get_label_func(item), loc, sub_menu)) lines.append(_format_entry(get_label_func(item), loc, sub_menu))
if sorted: if sorted:
@ -248,6 +244,10 @@ class Buildroot:
Note: only 'real' is (implictly) handled for now Note: only 'real' is (implictly) handled for now
""" """
if not symbol.is_symbol():
return False
if type == 'real' and not symbol.prompts:
return False
if not self.re_pkg_prefix.match(symbol.get_name()): if not self.re_pkg_prefix.match(symbol.get_name()):
return False return False
pkg_name = self._get_pkg_name(symbol) pkg_name = self._get_pkg_name(symbol)