From 2ef5d3288cdc772cdcbb7b5d11192305dd05b063 Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Wed, 20 Aug 2014 14:24:38 +0100 Subject: [PATCH] Fix word-splitting regexp in generate_di_list. Closes: #758512. Thanks to Philipp Hahn for the patch. --- debian/changelog | 2 ++ tools/generate_di_list | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c546eac..ef28d1d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium * Fix changelog date for 3.1.15. Closes: #751814 * Fix up Gnome CD set installing xfce - logic in boot menu creation was broken. Closes: #756774 + * Fix word-splitting regexp in generate_di_list. Closes: #758512. Thanks + to Philipp Hahn for the patch. -- Steve McIntyre <93sam@debian.org> Thu, 07 Aug 2014 01:45:01 +0100 diff --git a/tools/generate_di_list b/tools/generate_di_list index 0ba510b1..6a6ec30c 100755 --- a/tools/generate_di_list +++ b/tools/generate_di_list @@ -12,8 +12,8 @@ exit 0 if $ENV{ARCHES} =~ /^\s*source\s*$/; my @ARCHES; if ( $ENV{ARCHES} ) { - push @ARCHES, 'i386' if $ENV{ARCHES} =~ /[^\s]i386[\s\$]/; - push @ARCHES, 'amd64' if $ENV{ARCHES} =~ /[^\s]amd64[\s\$]/; + push @ARCHES, 'i386' if $ENV{ARCHES} =~ /(^|\s)i386(\s|$)/; + push @ARCHES, 'amd64' if $ENV{ARCHES} =~ /(^|\s)amd64(\s|$)/; push @ARCHES, grep { !/^(source|i386|amd64)$/ } split /\s+/, $ENV{ARCHES}; } @ARCHES = qw{i386 amd64} unless @ARCHES;