From 7ee43df8622cc0589d54248fb44cebe1c1d991d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2016 15:54:19 +0100 Subject: nix-channel: Fix --update This unbreaks "nixos-rebuild --upgrade". --- src/nix-channel/nix-channel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nix-channel/nix-channel.cc') diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 5b4c218199..3616278231 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -76,10 +76,10 @@ static void update(const StringSet & channelNames) // Download each channel. auto exprs = Strings{}; for (const auto & channel : channels) { - if (!channelNames.empty() && channelNames.find(channel.first) != channelNames.end()) - continue; auto name = channel.first; auto url = channel.second; + if (!(channelNames.empty() || channelNames.count(name))) + continue; // We want to download the url to a file to see if it's a tarball while also checking if we // got redirected in the process, so that we can grab the various parts of a nix channel -- cgit 1.4.1