Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print package information when using the y option #22

Merged
merged 1 commit into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/fosslight_yocto/_overwrite_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import os
from ._package_item import PackageItem, set_value_switch, update_package_name
from fosslight_util.parsing_yaml import parsing_yml
from copy import deepcopy

logger = logging.getLogger(constant.LOGGER_NAME)
KEY_PKG = "yocto_package"
Expand Down Expand Up @@ -98,7 +99,7 @@ def load_oss_pkg_info_yaml(oss_pkg_files, print_bin_android_mode, installed_pack
recipe_names_to_search = oss.yocto_recipe
pkg_names_to_search = oss.yocto_package
# Find the item to be excluded by the recipe or package name.
pkgs_to_exclude = [x.package_name for x in installed_packages_src if
pkgs_to_exclude = [(x.package_name, x.parent_package_name, x.oss_name) for x in installed_packages_src if
x.oss_name in recipe_names_to_search or x.name in recipe_names_to_search
or x.parent_package_name in pkg_names_to_search or x.package_name in pkg_names_to_search]

Expand All @@ -117,10 +118,17 @@ def load_oss_pkg_info_yaml(oss_pkg_files, print_bin_android_mode, installed_pack

oss.source_name_or_path = "" # Don't print file value loaded from yaml file.
oss.comment = MSG_FROM_YAML_ROW
pkg_item_list.append(oss)
oss_name_from_yaml = oss.name

for _, pkg_name, recipe in pkgs_to_exclude:
oss.parent_package_name = pkg_name
oss.oss_name = recipe
oss.name = oss_name_from_yaml
pkg_updated = deepcopy(oss)
pkg_item_list.append(pkg_updated)

# Exclude packages
for pkg_name in all_pkgs_to_exclude:
for pkg_name, _, _ in all_pkgs_to_exclude:
pkg_items = list(filter(lambda x: x.package_name == pkg_name
and x.exclude is False, installed_packages_bin))
pkg_items += [x for x in installed_packages_src if x.package_name == pkg_name and x.exclude is False]
Expand Down
10 changes: 9 additions & 1 deletion src/fosslight_yocto/_package_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ def oss_name(self, value):
self._name = value.replace("lib32-", "", 1)
self._oss_name = value

@property
def name(self):
return self._name

@name.setter
def name(self, value):
self._name = value

@property
def version(self):
return self._version
Expand Down Expand Up @@ -178,7 +186,7 @@ def get_print_item(self, bin_android_format=False, additional_column=[]):
exclude = EXCLUDE_TRUE_VALUE if self.exclude else ""
if len(self.declared_licenses) > 0:
license_to_print = self.declared_licenses
if bin_android_format: # BIN(Android) Sheet
if bin_android_format: # BIN(Yocto) Sheet
row = [self.parent_package_name, self.oss_name, "", self.name, self.version,
','.join(license_to_print),
self.download_location, self.homepage, self.copyright, exclude, self.comment]
Expand Down
Loading