lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix annoying Perl 5.16 warnings

Browse source 
I.e.

Subroutine Nix::Store::isValidPath redefined at /nix/store/clfzsf6gi7qh5i9c0vks1ifjam47rijn-perl-5.16.2/lib/perl5/5.16.2/XSLoader.pm line 92.

and so on.
This commit is contained in:
Eelco Dolstra 2013-03-08 00:27:32 +01:00
parent 28bba8c44f
commit e73d9e9488
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
perl/lib/Nix/Store.pm
View file

@ -42,50 +42,50 @@ if ($Nix::Config::useBindings) {
use File::Temp; use File::Temp;
use Fcntl qw/F_SETFD/; use Fcntl qw/F_SETFD/;
sub hashFile { *hashFile = sub {
my ($algo, $base32, $path) = @_; my ($algo, $base32, $path) = @_;
my $res = backtick("$Nix::Config::binDir/nix-hash", "--flat", $path, "--type", $algo, $base32 ? "--base32" : ()); my $res = backtick("$Nix::Config::binDir/nix-hash", "--flat", $path, "--type", $algo, $base32 ? "--base32" : ());
chomp $res; chomp $res;
return $res; return $res;
} };
sub hashPath { *hashPath = sub {
my ($algo, $base32, $path) = @_; my ($algo, $base32, $path) = @_;
my $res = backtick("$Nix::Config::binDir/nix-hash", $path, "--type", $algo, $base32 ? "--base32" : ()); my $res = backtick("$Nix::Config::binDir/nix-hash", $path, "--type", $algo, $base32 ? "--base32" : ());
chomp $res; chomp $res;
return $res; return $res;
} };
sub hashString { *hashString = sub {
my ($algo, $base32, $s) = @_; my ($algo, $base32, $s) = @_;
my $fh = File::Temp->new(); my $fh = File::Temp->new();
print $fh $s; print $fh $s;
my $res = backtick("$Nix::Config::binDir/nix-hash", $fh->filename, "--type", $algo, $base32 ? "--base32" : ()); my $res = backtick("$Nix::Config::binDir/nix-hash", $fh->filename, "--type", $algo, $base32 ? "--base32" : ());
chomp $res; chomp $res;
return $res; return $res;
} };
sub addToStore { *addToStore = sub {
my ($srcPath, $recursive, $algo) = @_; my ($srcPath, $recursive, $algo) = @_;
die "not implemented" if $recursive || $algo ne "sha256"; die "not implemented" if $recursive || $algo ne "sha256";
my $res = backtick("$Nix::Config::binDir/nix-store", "--add", $srcPath); my $res = backtick("$Nix::Config::binDir/nix-store", "--add", $srcPath);
chomp $res; chomp $res;
return $res; return $res;
} };
sub isValidPath { *isValidPath = sub {
my ($path) = @_; my ($path) = @_;
my $res = backtick("$Nix::Config::binDir/nix-store", "--check-validity", "--print-invalid", $path); my $res = backtick("$Nix::Config::binDir/nix-store", "--check-validity", "--print-invalid", $path);
chomp $res; chomp $res;
return $res ne $path; return $res ne $path;
} };
sub queryPathHash { *queryPathHash = sub {
my ($path) = @_; my ($path) = @_;
my $res = backtick("$Nix::Config::binDir/nix-store", "--query", "--hash", $path); my $res = backtick("$Nix::Config::binDir/nix-store", "--query", "--hash", $path);
chomp $res; chomp $res;
return $res; return $res;
} };
} }
1; 1;