Author: eelco
Date: Mon Sep 12 09:11:18 2011
New Revision: 29202
URL: https://ssl.nixos.org/websvn/nix/?rev=29202&sc=1
Log:
* "rm -rf" doesn't work if some directories are read-only.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==============================================================================
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
09:08:31 2011 (r29201)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
09:11:18 2011 (r29202)
@@ -364,7 +364,7 @@
exec 4> >(${pkgs.bzip2}/bin/bzip2 > $out/.trace/log.bz2)
exec 5> >(${pkgs.coreutils}/bin/tee /dev/fd/4)
${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder
$realArgs)' 2>&5
- (cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/rm -rf .build)
+ (cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/chmod -R u+w .build &&
${pkgs.coreutils}/bin/rm -rf .build)
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
