nix/6.NUR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

combine.py: handle symlinks when copying tree

Browse source 
By default `copy_tree` do not preserve symlinks and tries to resolve
them. If the symlinks is pointing to a non-existent target it will
fail.

This fixes that by copying symlinks as such, aka preserve_symlinks.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2020-05-22 12:52:02 +02:00
parent 55b82345ef
commit a5e7a9fefa
No known key found for this signature in database
GPG key ID: 4B8A6F5F62AFA8D1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nur/combine.py
View file

@ -51,7 +51,7 @@ def commit_repo(repo: Repo, message: str, path: Path) -> Repo:
assert tmp is not None
try:
copy_tree(repo_source(repo.name), tmp.name)
copy_tree(repo_source(repo.name), tmp.name, preserve_symlinks=1)
shutil.rmtree(repo_path, ignore_errors=True)
os.rename(tmp.name, repo_path)
tmp = None
@ -169,7 +169,7 @@ def setup_combined() -> None:
write_json_file(dict(repos={}), manifest_path)
manifest_lib = "lib"
copy_tree(str(ROOT.joinpath("lib")), manifest_lib)
copy_tree(str(ROOT.joinpath("lib")), manifest_lib, preserve_symlinks=1)
default_nix = "default.nix"
shutil.copy(ROOT.joinpath("default.nix"), default_nix)