bass-o-matic: rename

Aurelien Larcher

2021-01-15 7e9f71161a57c9a8c2c60c80d48863330dda2762

bass-o-matic: rename

 tools/bass/component.py

@@ -31,10 +31,13 @@
import subprocess
import json

class BassComponent(object):
class Component(object):
    def __init__(self, path=None, debug=False):
        self.debug = debug
        self.path = path
        self.name = None
        self.supplied_packages = []
        self.required_packages = []
        if path:
            component_pkg5_file = os.path.join(self.path, 'pkg5')
            if not os.path.isfile(component_pkg5_file):
@@ -43,7 +46,7 @@
                if not component_name:
                    raise ValueError('Component returns empty name at ' + self.path + '.')
                else:
                    self.component_name = component_name[0]
                    self.name = component_name[0]
                # get supplied packages, this may trigger the creation of a pkg5.fmris file
                self.supplied_packages = self.run_make(path, 'print-package-names')
                # always update fmris if list is overriden
@@ -55,7 +58,7 @@
                # get dependencies
                self.required_packages = self.run_make(path, 'print-required-packages')

                data = { 'name' : self.component_name,
                data = { 'name' : self.name,
                         'fmris': self.supplied_packages,
                         'dependencies' : self.required_packages }
                with open(component_pkg5_file, 'w') as f:
@@ -65,7 +68,7 @@
                    data = json.loads(f.read())
                if not data:
                    raise ValueError('Component pkg5 data is empty for path ' + self.path + '.')
                self.component_name = data['name']
                self.name = data['name']
                self.supplied_packages = data['fmris']
                self.required_packages = data['dependencies']
            if not self.supplied_packages or not self.supplied_packages[0]:

 tools/userland-mapping

@@ -28,7 +28,7 @@
import subprocess
import multiprocessing

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

try:
    from scandir import walk
@@ -59,8 +59,8 @@

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