puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

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

Browse source 
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
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/nix-channel.in
View file

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