Author: eelco
Date: Mon Mar 7 12:12:39 2011
New Revision: 26187
URL: https://svn.nixos.org/websvn/nix/?rev=26187&sc=1
Log:
* Revert r21410 because it breaks handling of "--max-jobs".
Modified:
nixos/trunk/modules/installer/tools/nixos-rebuild.sh
Modified: nixos/trunk/modules/installer/tools/nixos-rebuild.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-rebuild.sh Mon Mar 7
11:51:08 2011 (r26186)
+++ nixos/trunk/modules/installer/tools/nixos-rebuild.sh Mon Mar 7
12:12:39 2011 (r26187)
@@ -84,15 +84,9 @@
--show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
extraBuildFlags="$extraBuildFlags $i"
;;
- --max-jobs|-j*)
- if [ -z "${i:2}" ]; then
- # -j n
- extraBuildFlags="$extraBuildFlags $i $1"
- shift 1
- else
- # -jn
- extraBuildFlags="$extraBuildFlags $i"
- fi
+ --max-jobs|-j)
+ j="$1"; shift 1
+ extraBuildFlags="$extraBuildFlags $i $j"
;;
--fast)
buildNix=
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
