summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody A.W. Somerville <cody-somerville@ubuntu.com>2009-04-09 00:29:07 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:44 +0100
commit39876e86b9a1e225151f315883b69a011a98b46a (patch)
tree25f885f14fc23446e392ed34753526ce8331f316
parentcf28ec62c690c319aba9b119be70cd4babf6e218 (diff)
downloadlive-build-39876e86b9a1e225151f315883b69a011a98b46a.zip
live-build-39876e86b9a1e225151f315883b69a011a98b46a.tar.gz
Do not fail build when greps to generate udeb exclusion list return no results or grepped files do not exist.
-rwxr-xr-xhelpers/lh_binary_debian-installer6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 56878e4..f319d2a 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -557,9 +557,9 @@ then
fi
# Excluding udebs
- grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude
- grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude
- grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude
+ grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true
+ grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true
+ grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude || true
# Local exclude file
if [ -e ../config/binary_debian-installer/udeb_exclude ]