mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop dependency on List::MoreUtils

Browse source
This commit is contained in:
Eelco Dolstra 2012-08-27 11:28:34 -04:00
parent babe54bf97
commit 8b8fe6139e
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
perl/lib/Nix/Utils.pm
View file

@ -6,3 +6,14 @@ sub checkURL {
my ($url) = @_; my ($url) = @_;
die "invalid URL ‘$url’\n" unless $url =~ /^ $urlRE $ /x; die "invalid URL ‘$url’\n" unless $url =~ /^ $urlRE $ /x;
} }
sub uniq {
my %seen;
my @res;
foreach my $name (@_) {
next if $seen{$name};
$seen{$name} = 1;
push @res, $name;
}
return @res;
}

5
scripts/download-from-binary-cache.pl.in
View file

@ -8,7 +8,6 @@ use Nix::Store;
use Nix::Utils; use Nix::Utils;
use WWW::Curl::Easy; use WWW::Curl::Easy;
use WWW::Curl::Multi; use WWW::Curl::Multi;
use List::MoreUtils qw(any uniq);
use strict; use strict;
@ -195,12 +194,12 @@ sub getAvailableCaches {
@urls = (); @urls = ();
foreach my $url (@untrustedUrls) { foreach my $url (@untrustedUrls) {
die "binary cache ‘$url’ is not trusted (please add it to ‘trusted-binary-caches’ in $Nix::Config::confDir/nix.conf)\n" die "binary cache ‘$url’ is not trusted (please add it to ‘trusted-binary-caches’ in $Nix::Config::confDir/nix.conf)\n"
unless any { $url eq $_ } @trustedUrls; unless grep { $url eq $_ } @trustedUrls > 0;
push @urls, $url; push @urls, $url;
} }
} }
foreach my $url (uniq @urls) { foreach my $url (Nix::Utils::uniq @urls) {
# FIXME: not atomic. # FIXME: not atomic.
$queryCache->execute($url); $queryCache->execute($url);