From d43565c3e837feea478aaa71bad7e0a92c1911f0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2006 11:11:16 +0000 Subject: * In `nix-channel --update', skip manifests that assume a Nix store at a different location than the user's. This makes channels usable as a source deployment mechanism for people who install Nix under non-standard prefixes. (NIX-57) --- scripts/nix-channel.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/nix-channel.in') diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in index 19b012922bca..e3abc7ea5cbc 100644 --- a/scripts/nix-channel.in +++ b/scripts/nix-channel.in @@ -23,6 +23,7 @@ sub readChannels { open CHANNELS, "<$channelsList" or die "cannot open `$channelsList': $!"; while () { chomp; + next if /^\s*\#/; push @channels, $_; } close CHANNELS; @@ -81,7 +82,7 @@ sub update { # Pull cache manifests. foreach my $url (@channels) { print "pulling cache manifest from `$url'\n"; - system("@bindir@/nix-pull", "$url/MANIFEST") == 0 + system("@bindir@/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0 or die "cannot pull cache manifest from `$url'"; } -- cgit 1.4.1