Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix word-splitting regexp in generate_di_list. 

Closes: #758512. Thanks to Philipp Hahn for the patch.
This commit is contained in:
Steve McIntyre 2014-08-20 14:24:38 +01:00
parent 6d623c6b88
commit 2ef5d3288c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -4,6 +4,8 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
* Fix changelog date for 3.1.15. Closes: #751814 * Fix changelog date for 3.1.15. Closes: #751814
* Fix up Gnome CD set installing xfce - logic in boot menu creation was * Fix up Gnome CD set installing xfce - logic in boot menu creation was
broken. Closes: #756774 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 -- Steve McIntyre <93sam@debian.org> Thu, 07 Aug 2014 01:45:01 +0100

4
tools/generate_di_list
View File

@ -12,8 +12,8 @@ exit 0 if $ENV{ARCHES} =~ /^\s*source\s*$/;
my @ARCHES; my @ARCHES;
if ( $ENV{ARCHES} ) { if ( $ENV{ARCHES} ) {
push @ARCHES, 'i386' if $ENV{ARCHES} =~ /[^\s]i386[\s\$]/; push @ARCHES, 'i386' if $ENV{ARCHES} =~ /(^|\s)i386(\s|$)/;
push @ARCHES, 'amd64' if $ENV{ARCHES} =~ /[^\s]amd64[\s\$]/; push @ARCHES, 'amd64' if $ENV{ARCHES} =~ /(^|\s)amd64(\s|$)/;
push @ARCHES, grep { !/^(source|i386|amd64)$/ } split /\s+/, $ENV{ARCHES}; push @ARCHES, grep { !/^(source|i386|amd64)$/ } split /\s+/, $ENV{ARCHES};
} }
@ARCHES = qw{i386 amd64} unless @ARCHES; @ARCHES = qw{i386 amd64} unless @ARCHES;