From 5b7c019e2a5b320589d9d7401ac072e5a0a1dffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Jun 2012 21:36:46 +0200
Subject: [PATCH 1/2] nixos-rebuild: make 'pull' fail in case it did not pull
 anything.

---
 modules/installer/tools/nixos-rebuild.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 29927f8a126..98b46cb7cdb 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -125,9 +125,13 @@ fi
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
 if [ -n "$pullManifest" -o "$action" = pull ]; then
+    set -o pipefail
     manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
+    set -o nopipefail
+    [ "$action" = pull -a $? -ne 0 ] && exit 1
+
     mkdir -p /nix/var/nix/channel-cache
     for i in $manifests; do
         NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true

From de87b07bb366ec2f76e59a7f18a2c25bc456bb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Jun 2012 21:56:29 +0200
Subject: [PATCH 2/2] nixos-rebuild: fail if any case of pull fails.

---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 98b46cb7cdb..22aa847e192 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -130,7 +130,7 @@ if [ -n "$pullManifest" -o "$action" = pull ]; then
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
     set -o nopipefail
-    [ "$action" = pull -a $? -ne 0 ] && exit 1
+    if [ $? -ne 0 ]; then exit 1; fi
 
     mkdir -p /nix/var/nix/channel-cache
     for i in $manifests; do