diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py index 2ac129310..00ca5f471 100644 --- a/elbepack/cdroms.py +++ b/elbepack/cdroms.py @@ -22,6 +22,7 @@ def add_source_pkg(repo, component, cache, pkg, version, forbid): if pkg in forbid: + logging.info("Ignoring source package %s", pkg) return pkg_id = f'{pkg}-{version}' try: @@ -56,6 +57,12 @@ def mk_source_cdrom(components, codename, for component in components.keys(): rfs, cache, pkg_lst = components[component] logging.info('Adding %s component', component) + + forbiddenSrcPackages = [] + for name, _ in cache.get_corresponding_source_packages(forbiddenPackages): + if name not in forbiddenSrcPackages: + forbiddenSrcPackages.append(name) + rfs.mkdir_p('/var/cache/elbe/sources') repo = CdromSrcRepo(codename, init_codename, os.path.join(target, f'srcrepo-{component}'), @@ -64,14 +71,14 @@ def mk_source_cdrom(components, codename, for pkg, version in pkg_lst: add_source_pkg(repo, component, cache, pkg, version, - forbiddenPackages) + forbiddenSrcPackages) if component == 'main' and xml is not None: for p in xml.node('debootstrappkgs'): pkg = XMLPackage(p) srcpkgs = cache.get_corresponding_source_packages([pkg]) for srcpkg, srcpkg_ver in srcpkgs: - add_source_pkg(repo, component, cache, srcpkg, srcpkg_ver, forbiddenPackages) + add_source_pkg(repo, component, cache, srcpkg, srcpkg_ver, forbiddenSrcPackages) # elbe fetch_initvm_pkgs has downloaded all sources to # /var/cache/elbe/sources