Merge remote-tracking branch 'mwhudson/fix-kylin' into ubuntu/master

* mwhudson/fix-kylin:
  isobuilder: pass ignore_dangling_symlinks=True when copying apt config
This commit is contained in:
Utkarsh Gupta 2026-02-16 16:13:53 +05:30
commit 435c4e1895

View File

@ -41,7 +41,7 @@ class AptStateManager:
for path in "etc/apt", "var/lib/apt": for path in "etc/apt", "var/lib/apt":
tgt = self.apt_root.joinpath(path) tgt = self.apt_root.joinpath(path)
tgt.parent.mkdir(parents=True, exist_ok=True) tgt.parent.mkdir(parents=True, exist_ok=True)
shutil.copytree(chroot.joinpath(path), tgt) shutil.copytree(chroot.joinpath(path), tgt, ignore_dangling_symlinks=True)
self.apt_conf_path.write_text(f'Dir "{self.apt_root}/"; \n') self.apt_conf_path.write_text(f'Dir "{self.apt_root}/"; \n')
with self.logger.logged("updating apt indices"): with self.logger.logged("updating apt indices"):
self.logger.run(["apt-get", "update"], env=self._apt_env()) self.logger.run(["apt-get", "update"], env=self._apt_env())