X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fscript%2Fcreate_rpm_data.py;h=28133c017597bf29e07676e6ebd3b96b33246645;hb=dcef34570a2fb6d6b674da2ba4dc4dc9ccfb2124;hp=9c4b747660e0e603b4c846687daa1e95b82eea1b;hpb=4ded4f2a805e9447be90751d7d4fb7e11552e545;p=ta%2Fbuild-tools.git diff --git a/tools/script/create_rpm_data.py b/tools/script/create_rpm_data.py index 9c4b747..28133c0 100755 --- a/tools/script/create_rpm_data.py +++ b/tools/script/create_rpm_data.py @@ -33,6 +33,8 @@ from tools.log import set_logging from tools.io import read_from, write_to, read_json from tools.convert import to_json, CsvConverter +LOCAL_REPOS = ['localrepo', 'anaconda'] + class RpmDataBuilder(object): def __init__(self, build_config, yum_info_installed, rpm_info_installed, @@ -191,7 +193,10 @@ class RpmDataBuilder(object): def _read_configured_repos(self): repos = self.repoconfig.read_sections( ['baseimage-repositories', 'repositories']) - repos.append(self.repoconfig.get_localrepo(remote=True)) + if 'BUILD_URL' in os.environ: + repos.append(self.repoconfig.get_localrepo(remote=True)) + else: + repos.append(self.repoconfig.get_localrepo(remote=False)) logging.debug('Configured repos: {}'.format(pformat(repos))) return repos @@ -251,7 +256,7 @@ class RpmDataBuilder(object): def _get_rpm_available_in(self, rpm, available_rpms): if 'From repo' in rpm.keys(): - if rpm['From repo'] == 'localrepo': + if rpm['From repo'] in LOCAL_REPOS: return 'localrepo' available_repo_rpms = available_rpms[rpm['From repo']] for a_rpm in available_repo_rpms: