[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-34-g982f87e
Daniel Baumann
daniel at debian.org
Wed Apr 8 22:31:03 UTC 2009
The following commit has been merged in the master branch:
commit 982f87e47ac05de32d0b12aa2c997f8bfa478fba
Author: Cody A.W. Somerville <cody-somerville at ubuntu.com>
Date: Thu Apr 9 00:29:07 2009 +0200
Do not fail build when greps to generate udeb exclusion list return no results or grepped files do not exist.
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 ]
--
Debian Live build scripts
More information about the debian-live-changes
mailing list