diff options
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/lib/Nix/Config.pm.in | 2 | ||||
| -rw-r--r-- | perl/lib/Nix/CopyClosure.pm | 4 | ||||
| -rw-r--r-- | perl/lib/Nix/Manifest.pm | 12 | ||||
| -rw-r--r-- | perl/lib/Nix/SSH.pm | 4 | ||||
| -rw-r--r-- | perl/lib/Nix/Utils.pm | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in index c23e1ae4bee2..3575d99cb671 100644 --- a/perl/lib/Nix/Config.pm.in +++ b/perl/lib/Nix/Config.pm.in @@ -33,7 +33,7 @@ sub readConfig { my $config = "$confDir/nix.conf"; return unless -f $config; - open CONFIG, "<$config" or die "cannot open '$config'"; + open CONFIG, "<$config" or die "cannot open ‘$config’"; while (<CONFIG>) { /^\s*([\w\-\.]+)\s*=\s*(.*)$/ or next; $config{$1} = $2; diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm index 902ee1a1bc9f..affb3ea524ae 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -35,14 +35,14 @@ sub copyToOpen { my $missingSize = 0; $missingSize += (queryPathInfo($_, 1))[3] foreach @missing; - printf STDERR "copying %d missing paths (%.2f MiB) to '$sshHost'...\n", + printf STDERR "copying %d missing paths (%.2f MiB) to ‘$sshHost’...\n", scalar(@missing), $missingSize / (1024**2); return if $dryRun; # Send the "import paths" command. syswrite($to, pack("L<x4", 4)) or die; exportPaths(fileno($to), @missing); - readInt($from) == 1 or die "remote machine '$sshHost' failed to import closure\n"; + readInt($from) == 1 or die "remote machine ‘$sshHost’ failed to import closure\n"; } diff --git a/perl/lib/Nix/Manifest.pm b/perl/lib/Nix/Manifest.pm index 6438398e1766..0da376761201 100644 --- a/perl/lib/Nix/Manifest.pm +++ b/perl/lib/Nix/Manifest.pm @@ -60,10 +60,10 @@ sub readManifest_ { # Decompress the manifest if necessary. if ($manifest =~ /\.bz2$/) { open MANIFEST, "$Nix::Config::bzip2 -d < $manifest |" - or die "cannot decompress '$manifest': $!"; + or die "cannot decompress ‘$manifest’: $!"; } else { open MANIFEST, "<$manifest" - or die "cannot open '$manifest': $!"; + or die "cannot open ‘$manifest’: $!"; } my $inside = 0; @@ -287,7 +287,7 @@ sub parseNARInfo { # FIXME: might be useful to support multiple signatures per .narinfo. if (!defined $sig) { - warn "NAR info file '$location' lacks a signature; ignoring\n"; + warn "NAR info file ‘$location’ lacks a signature; ignoring\n"; return undef; } my ($keyName, $sig64) = split ":", $sig; @@ -295,7 +295,7 @@ sub parseNARInfo { my $publicKey = $Nix::Config::binaryCachePublicKeys{$keyName}; if (!defined $publicKey) { - warn "NAR info file '$location' is signed by unknown key '$keyName'; ignoring\n"; + warn "NAR info file ‘$location’ is signed by unknown key ‘$keyName’; ignoring\n"; return undef; } @@ -306,12 +306,12 @@ sub parseNARInfo { [ map { "$Nix::Config::storeDir/$_" } @refs ]); }; if ($@) { - warn "cannot compute fingerprint of '$location'; ignoring\n"; + warn "cannot compute fingerprint of ‘$location’; ignoring\n"; return undef; } if (!checkSignature($publicKey, decode_base64($sig64), $fingerprint)) { - warn "NAR info file '$location' has an incorrect signature; ignoring\n"; + warn "NAR info file ‘$location’ has an incorrect signature; ignoring\n"; return undef; } diff --git a/perl/lib/Nix/SSH.pm b/perl/lib/Nix/SSH.pm index 4b3d84b19383..95393d881450 100644 --- a/perl/lib/Nix/SSH.pm +++ b/perl/lib/Nix/SSH.pm @@ -84,7 +84,7 @@ sub connectToRemoteNix { $extraFlags ||= ""; - # Start 'nix-store --serve' on the remote host. + # Start ‘nix-store --serve’ on the remote host. my ($from, $to); # FIXME: don't start a shell, start ssh directly. my $pid = open2($from, $to, "exec ssh -x -a $sshHost @globalSshOpts @{$sshOpts} nix-store --serve --write $extraFlags"); @@ -97,7 +97,7 @@ sub connectToRemoteNix { syswrite($to, pack("L<x4L<x4", $SERVE_MAGIC_1, $clientVersion)) or die; $magic = readInt($from); }; - die "unable to connect to '$sshHost'\n" if $@; + die "unable to connect to ‘$sshHost’\n" if $@; die "did not get valid handshake from remote host\n" if $magic != 0x5452eecb; my $serverVersion = readInt($from); diff --git a/perl/lib/Nix/Utils.pm b/perl/lib/Nix/Utils.pm index 44955a70698c..392c45f2fffb 100644 --- a/perl/lib/Nix/Utils.pm +++ b/perl/lib/Nix/Utils.pm @@ -10,7 +10,7 @@ $urlRE = "(?: [a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\! sub checkURL { my ($url) = @_; - die "invalid URL '$url'\n" unless $url =~ /^ $urlRE $ /x; + die "invalid URL ‘$url’\n" unless $url =~ /^ $urlRE $ /x; } sub uniq { @@ -26,7 +26,7 @@ sub uniq { sub writeFile { my ($fn, $s) = @_; - open TMP, ">$fn" or die "cannot create file '$fn': $!"; + open TMP, ">$fn" or die "cannot create file ‘$fn’: $!"; print TMP "$s" or die; close TMP or die; } @@ -34,7 +34,7 @@ sub writeFile { sub readFile { local $/ = undef; my ($fn) = @_; - open TMP, "<$fn" or die "cannot open file '$fn': $!"; + open TMP, "<$fn" or die "cannot open file ‘$fn’: $!"; my $s = <TMP>; close TMP or die; return $s; |