* nix-channel: fail if we don't have write permission to the manifests

directory.  Previously in this situation we did add the Nix
  expressions from the channel to allow installation from source, but
  this doesn't work for binary-only channels and leads to confusing
  error messages.
This commit is contained in:
Eelco Dolstra 2012-02-02 12:25:56 +00:00
parent baa0501cc1
commit ce86a9a0ae

View file

@ -79,12 +79,8 @@ sub update {
# Create the manifests directory if it doesn't exist.
mkdir $manifestDir, 0755 unless -e $manifestDir;
# Do we have write permission to the manifests directory? If not,
# then just skip pulling the manifest and just download the Nix
# expressions. If the user is a non-privileged user in a
# multi-user Nix installation, he at least gets installation from
# source.
if (-W $manifestDir) {
# Do we have write permission to the manifests directory?
die "$0: you do not have write permission to `$manifestDir'!\n" unless -W $manifestDir;
# Pull cache manifests.
foreach my $url (@channels) {
@ -93,8 +89,6 @@ sub update {
or die "cannot pull cache manifest from `$url'";
}
}
# Create a Nix expression that fetches and unpacks the channel Nix
# expressions.