python/PyNUTClient: update to 2.8.2

Marcel Telka

2024-04-02 327b05574f0dc1b1046c72401256ce5afd3e3247

 tools/userland-mapping

@@ -1,4 +1,4 @@
#!/usr/bin/python3.5
#!/usr/bin/python3.9

#
# This file and its contents are supplied under the terms of the
@@ -28,7 +28,7 @@
import subprocess
import multiprocessing

from bass.component import BassComponent
from bass.component import Component

try:
    from scandir import walk
@@ -49,7 +49,8 @@
    for dirpath, dirnames, filenames in walk(workspace_path):
        for name in filenames:
            if expression.match(name):
                paths.append(dirpath)
                if not os.path.isfile(os.path.join( dirpath, 'pkg5.ignore')):
                    paths.append(dirpath)
                del dirnames[:]
                break

@@ -58,20 +59,18 @@

def generate_component_data(component_path, subdir='components'):
    result = []
    component = BassComponent(path=component_path)
    component_name = component.component_name
    component = Component(path=component_path)
    component_name = component.name
    if not component_name:
        raise ValueError('Component name is empty for path ' + component_path + '.')
    component_fmris = component.supplied_packages
    if not component_fmris:
        raise ValueError('Component FMRIs is empty for path ' + component_path + '.')

    component_relative_path = component_path.split(os.path.join(os.environ['WS_TOP'], subdir))[-1].replace('/', '', 1)

    return component_fmris, component_name, component_relative_path


def generate_userland_mapping(workspace_path, subdir='components'):
def generate_userland_mapping(workspace_path, subdir='components', repo='userland', repo_map=[]):
    mapping = []

    paths = find_component_paths(path=workspace_path, subdir=subdir)
@@ -80,9 +79,15 @@

    for component_fmris, component_name, component_relative_path in results:
        for component_fmri in component_fmris:
            component_repo = repo
            for rm in repo_map:
                if component_relative_path.startswith(rm['pfx']):
                    component_repo = rm['repo']

            mapping.append({'name': component_name,
                            'fmri': component_fmri,
                            'path': component_relative_path})
                            'path': component_relative_path,
                            'repo': component_repo})

    component_mapping_file = os.path.join(workspace_path, subdir, COMPONENT_MAPPING_FILENAME)
    with open(component_mapping_file, 'w') as f:
@@ -94,13 +99,24 @@

    parser.add_argument('-w', '--workspace', default=os.getenv('WS_TOP'), help='Path to workspace')
    parser.add_argument('--subdir', default='components', help='Directory holding components')
    parser.add_argument('--repo', default='userland', help='Default target repository')
    parser.add_argument('--repo-map', help='Target repository for this directory; e.g., encumbered/=userland-encumbered', action='append')

    args = parser.parse_args()

    workspace = args.workspace
    subdir = args.subdir

    generate_userland_mapping(workspace_path=workspace, subdir=subdir)
    repo = args.repo
    repo_map = []
    if args.repo_map:
        for rm in args.repo_map:
            l = rm.split("=")
            if len(l) != 2:
                raise ValueError('invalid --repo-map: ' + rm)
            repo_map.append({'pfx': l[0], 'repo': l[1]})

    generate_userland_mapping(workspace_path=workspace, subdir=subdir, repo=repo, repo_map=repo_map)

if __name__ == '__main__':
    main()