* 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)

1 files changed, 2 insertions, 1 deletions

diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in
index 19b012922b..e3abc7ea5c 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 (<CHANNELS>) {
         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'";
     }