diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-08T11·40+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-08T11·40+0000 |
| commit | 48ebe4527e5af974832bc39f15fcd46ac740effa (patch) | |
| tree | c8a7621a591cc10111193fdb10136f275f44d7a5 | |
| parent | fbc434ee4c39e7516f3634371442899864786584 (diff) | |
* Better error reporting in readmanifest.
* Use force flag in `mv' to prevent silly interactive questions (this happens with shared Nix stores).
| -rw-r--r-- | scripts/nix-pull.in | 2 | ||||
| -rw-r--r-- | scripts/readmanifest.pm.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index 8bc560ba5f5f..841e97e83109 100644 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -51,7 +51,7 @@ sub processURL { my $finalPath = "$stateDir/manifests/$baseName-$hash.nixmanifest"; - system("mv '$manifest' '$finalPath'") == 0 + system("mv -f '$manifest' '$finalPath'") == 0 or die "cannot move `$manifest' to `$finalPath"; } diff --git a/scripts/readmanifest.pm.in b/scripts/readmanifest.pm.in index 3e74c88f98b7..ea1c5a447063 100644 --- a/scripts/readmanifest.pm.in +++ b/scripts/readmanifest.pm.in @@ -35,7 +35,8 @@ sub readManifest { my $patches = shift; my $successors = shift; - open MANIFEST, "<$manifest"; + open MANIFEST, "<$manifest" + or die "cannot open `$manifest': $!"; my $inside = 0; my $type; |