summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Armstrong <synrg@debian.org>2010-01-19 20:44:03 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:03 +0100
commitad43063cf5e3241644faa007213534ddfd02a571 (patch)
treec2b70b6b9bf7957e2d054eaa53eb77f89e421bc5
parente1a4e1b91b917ff9086c199a3dc86a39ae37ed38 (diff)
downloadlive-build-ad43063cf5e3241644faa007213534ddfd02a571.zip
live-build-ad43063cf5e3241644faa007213534ddfd02a571.tar.gz
Update lh_source_debian to deal with multiple dsc files for the same source.
-rwxr-xr-xhelpers/lh_source_debian5
1 files changed, 4 insertions, 1 deletions
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index fef38a4..2668948 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -127,7 +127,10 @@ rm -f source-selection.txt
# Sort sources
for DSC in chroot/*.dsc
do
- SOURCE="$(sed -n 's|^Source: ||p' ${DSC})"
+ SOURCE="$(sed -n 's|^Source: ||p' ${DSC} 2>/dev/null || :)"
+ # The sed may fail if multiple dsc files exist for same source, as the
+ # first one to match will have already been moved.
+ [ -n "$SOURCE" ] || continue
case "${SOURCE}" in
lib?*)