troldspejlet/nvd
troldspejlet/nvd
1
0
Fork 0
mirror of https://gitlab.com/khumba/nvd.git synced 2024-11-10 06:59:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be stricter about checking exit codes from nix.

Browse source
This commit is contained in:
Bryan Gardiner 2023-05-22 11:44:37 -07:00
parent 35bd54cb63
commit cf59afb64f
No known key found for this signature in database
GPG key ID: 53EFBCA063E6183C
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -5,6 +5,9 @@
- Fix compatibility with nix-2.3 where `nix --extra-experimental-features` isn't - Fix compatibility with nix-2.3 where `nix --extra-experimental-features` isn't
a known flag yet. We have to switch on the version of Nix we've been given. a known flag yet. We have to switch on the version of Nix we've been given.
- Stricter behaviour around invoking `nix`. Nix returning a nonzero exit code
will cause nvd to abort in most cases.
## 0.2.2 (2023-05-22) ## 0.2.2 (2023-05-22)
- Fixed crash when `nix-store --query --references` returns nothing (e.g. for a - Fixed crash when `nix-store --query --references` returns nothing (e.g. for a

10
src/nvd
View file

@ -232,7 +232,8 @@ class PackageManifest:
direct_deps_str: str = subprocess.run( direct_deps_str: str = subprocess.run(
[make_nix_bin_path("nix-store"), "--query", "--references", str(root)], [make_nix_bin_path("nix-store"), "--query", "--references", str(root)],
stdout=PIPE, stdout=PIPE,
text=True text=True,
check=True,
).stdout.rstrip("\n") ).stdout.rstrip("\n")
direct_deps: List[str] = \ direct_deps: List[str] = \
@ -445,7 +446,9 @@ def query_closure_disk_usage_bytes(target: Path) -> Optional[int]:
+ make_extra_experimental_features_args() + make_extra_experimental_features_args()
+ ["path-info", "--closure-size", target_str], + ["path-info", "--closure-size", target_str],
stdout=PIPE, stdout=PIPE,
text=True text=True,
# Explicitly omitting check=True here, since this function is
# allowed to fail.
).stdout ).stdout
except FileNotFoundError: except FileNotFoundError:
sys.stderr.write("nvd: Couldn't run 'nix path-info --closure-size'.\n") sys.stderr.write("nvd: Couldn't run 'nix path-info --closure-size'.\n")
@ -533,6 +536,7 @@ def run_list(*, root, only_selected, name_patterns):
[make_nix_bin_path("nix-store"), "-qR", str(path)], [make_nix_bin_path("nix-store"), "-qR", str(path)],
stdout=PIPE, stdout=PIPE,
text=True, text=True,
check=True,
).stdout.rstrip("\n").split("\n") ).stdout.rstrip("\n").split("\n")
closure_map: Dict[str, List[str]] = closure_paths_to_map(closure_paths) closure_map: Dict[str, List[str]] = closure_paths_to_map(closure_paths)
@ -592,11 +596,13 @@ def run_diff(*, root1, root2):
[make_nix_bin_path("nix-store"), "-qR", str(left_resolved)], [make_nix_bin_path("nix-store"), "-qR", str(left_resolved)],
stdout=PIPE, stdout=PIPE,
text=True, text=True,
check=True,
).stdout.rstrip("\n").split("\n") ).stdout.rstrip("\n").split("\n")
right_closure_paths: List[str] = subprocess.run( right_closure_paths: List[str] = subprocess.run(
[make_nix_bin_path("nix-store"), "-qR", (right_resolved)], [make_nix_bin_path("nix-store"), "-qR", (right_resolved)],
stdout=PIPE, stdout=PIPE,
text=True, text=True,
check=True,
).stdout.rstrip("\n").split("\n") ).stdout.rstrip("\n").split("\n")
# Maps from pname to lists of versions. # Maps from pname to lists of versions.