Fix broken patch

This commit is contained in:
Eelco Dolstra 2014-02-26 13:48:23 +01:00
parent 8a02fdc38e
commit bf4a577a58
2 changed files with 2 additions and 2 deletions

View File

@ -40,7 +40,7 @@ my %requests;
my %scheduled;
my $caBundle = $ENV{"CURL_CA_BUNDLE"} // $ENV{"OPENSSL_X509_CERT_FILE"};
my $userName = getpwuid($<) or $ENV{"USER"} or die "cannot figure out user name";
my $userName = getpwuid($<) || $ENV{"USER"} or die "cannot figure out user name";
my $requireSignedBinaryCaches = ($Nix::Config::config{"signed-binary-caches"} // "0") ne "0";

View File

@ -22,7 +22,7 @@ my $channelsList = "$home/.nix-channels";
my $nixDefExpr = "$home/.nix-defexpr";
# Figure out the name of the channels profile.
my $userName = getpwuid($<) or $ENV{"USER"} or die "cannot figure out user name");
my $userName = getpwuid($<) || $ENV{"USER"} or die "cannot figure out user name";
my $profile = "$Nix::Config::stateDir/profiles/per-user/$userName/channels";
mkpath(dirname $profile, 0, 0755);