From 48ebe4527e5af974832bc39f15fcd46ac740effa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 8 Feb 2005 11:40:19 +0000
Subject: [PATCH] * Better error reporting in readmanifest. * Use force flag in
`mv' to prevent silly interactive questions (this happens with shared Nix
stores).
---
scripts/nix-pull.in | 2 +-
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 8bc560ba5..841e97e83 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 3e74c88f9..ea1c5a447 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;
--
GitLab