Merge pull request #250738 from arianvp/fix-repart

modules/image/repart: Fix stripNixStorePrefix
This commit is contained in:
Arian van Putten 2023-08-22 18:37:06 +00:00 committed by GitHub
commit 483daed240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -53,7 +53,7 @@ def add_closure_to_definition(
source = Path(line.strip())
target = str(source.relative_to("/nix/store/"))
target = f":{target}" if strip_nix_store_prefix else ""
target = f":/{target}" if strip_nix_store_prefix else ""
copy_files_lines.append(f"CopyFiles={source}{target}\n")
@ -102,7 +102,7 @@ def main() -> None:
add_contents_to_definition(definition, contents)
closure = config.get("closure")
strip_nix_store_prefix = config.get("stripStorePaths")
strip_nix_store_prefix = config.get("stripNixStorePrefix")
add_closure_to_definition(definition, closure, strip_nix_store_prefix)
print(target_dir.absolute())