From 5b396d4fe7ca60699bda1cd0bbcbc6d515e56775 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Tue, 15 Jan 2008 02:44:41 +0000
Subject: [PATCH] Remove conditionals, as an expansion never 'fails': it just
 won't copy any files.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
---
 helpers/lh_binary_debian-installer | 33 +++++++++++-------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 81d535f7c..6b48139c5 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -254,13 +254,10 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
 	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 fi
 
-if ls binary.deb/archives/*.deb > /dev/null 2>&1
-then
-	for FILE in binary.deb/archives/*.deb
-	do
-		Install_file "${FILE}"
-	done
-fi
+for FILE in binary.deb/archives/*.deb
+do
+	Install_file "${FILE}"
+done
 
 # Including base debian packages
 if [ -d cache/packages_bootstrap ]
@@ -275,21 +272,15 @@ else
 fi
 
 # Including local debs
-if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
-then
-	for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
-	do
-		Install_file "${FILE}"
-	done
-fi
+for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+do
+	Install_file "${FILE}"
+done
 
-if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1
-then
-	for FILE in ../config/binary_local-debs/*_all.deb
-	do
-		Install_file "${FILE}"
-	done
-fi
+for FILE in ../config/binary_local-debs/*_all.deb
+do
+	Install_file "${FILE}"
+done
 
 # Generating deb indices
 mkdir -p binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}