diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-20 17:00:17 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-20 18:03:48 +0200 |
commit | 11849a320e4f522b97fcdf09ff0940496880475b (patch) | |
tree | 13548f1c1bb2e01590b31d66d9bb8f46534bc99f /corepkgs | |
parent | 373fad75e19a2f24db512621b8cedb627d03d49d (diff) |
Use proper quotes everywhere
Diffstat (limited to 'corepkgs')
-rw-r--r-- | corepkgs/buildenv.pl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/corepkgs/buildenv.pl b/corepkgs/buildenv.pl index f98cca7c8..264442104 100644 --- a/corepkgs/buildenv.pl +++ b/corepkgs/buildenv.pl @@ -1,6 +1,7 @@ use strict; use Cwd; use IO::Handle; +use utf8; STDOUT->autoflush(1); @@ -53,18 +54,18 @@ sub createLinks { elsif (-l _) { my $target = readlink $dstFile or die; if (!-d $target) { - die "collision between directory `$srcFile' and non-directory `$target'"; + die "collision between directory ‘$srcFile’ and non-directory ‘$target’"; } - unlink $dstFile or die "error unlinking `$dstFile': $!"; + unlink $dstFile or die "error unlinking ‘$dstFile’: $!"; mkdir $dstFile, 0755 || - die "error creating directory `$dstFile': $!"; + die "error creating directory ‘$dstFile’: $!"; createLinks($target, $dstFile, $priorities{$dstFile}); createLinks($srcFile, $dstFile, $priority); } else { symlink($srcFile, $dstFile) || - die "error creating link `$dstFile': $!"; + die "error creating link ‘$dstFile’: $!"; $priorities{$dstFile} = $priority; $symlinks++; } @@ -75,17 +76,16 @@ sub createLinks { if (-l $dstFile) { my $target = readlink $dstFile; my $prevPriority = $priorities{$dstFile}; - die ( "collision between `$srcFile' and `$target'; " - . "use `nix-env --set-flag " - . "priority NUMBER PKGNAME' to change the priority of " - . "one of the conflicting packages\n" ) + die("collision between ‘$srcFile’ and ‘$target’; " . + "use ‘nix-env --set-flag priority NUMBER PKGNAME’ " . + "to change the priority of one of the conflicting packages\n") if $prevPriority == $priority; next if $prevPriority < $priority; unlink $dstFile or die; } symlink($srcFile, $dstFile) || - die "error creating link `$dstFile': $!"; + die "error creating link ‘$dstFile’: $!"; $priorities{$dstFile} = $priority; $symlinks++; } |