[SCM] live-helper branch, debian, updated. debian/2.0_a4-1-1-gc6ecdcf

Daniel Baumann daniel at debian.org
Tue Jan 19 19:47:21 UTC 2010


The following commit has been merged in the debian branch:
commit c6ecdcfc9cdba36d74985d5477272460cbb14414
Author: Ben Armstrong <synrg at debian.org>
Date:   Tue Jan 19 20:44:03 2010 +0100

    Update lh_source_debian to deal with multiple dsc files for the same source.

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?*)

-- 
live-helper



More information about the debian-live-changes mailing list