Skip to content

Commit f6c1d21

Browse files
committed
Handle as_text correctly in cache
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 9f2b46a commit f6c1d21

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

etc/scripts/utils_thirdparty.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -918,15 +918,15 @@ def load_pkginfo_data(self, dest_dir=THIRDPARTY_DIR):
918918

919919
holder = raw_data['Author']
920920
holder_contact = raw_data['Author-email']
921-
copyright_statement = f'Copyright (c) {holder} <{holder_contact}>'
921+
copyright = f'Copyright (c) {holder} <{holder_contact}>'
922922

923923
pkginfo_data = dict(
924924
name=raw_data['Name'],
925925
declared_license=declared_license,
926926
version=raw_data['Version'],
927927
description=raw_data['Summary'],
928928
homepage_url=raw_data['Home-page'],
929-
copyright=copyright_statement,
929+
copyright=copyright,
930930
license_expression=license_expression,
931931
holder=holder,
932932
holder_contact=holder_contact,
@@ -2927,7 +2927,7 @@ def fetch_package_wheel(name, version, environment, dest_dir=THIRDPARTY_DIR):
29272927

29282928
def check_about(dest_dir=THIRDPARTY_DIR):
29292929
try:
2930-
subprocess.check_output(f'venv/bin/about check {dest_dir}'.split())
2930+
subprocess.check_output(f'about check {dest_dir}'.split())
29312931
except subprocess.CalledProcessError as cpe:
29322932
print()
29332933
print('Invalid ABOUT files:')
@@ -2965,7 +2965,6 @@ def find_problems(
29652965

29662966
check_about(dest_dir=dest_dir)
29672967

2968-
29692968
def compute_normalized_license_expression(declared_licenses):
29702969
if not declared_licenses:
29712970
return

0 commit comments

Comments
 (0)