Bug#413506: strange error from make_disc_trees.pl

[Raphael Hertzog <hertzog@debian.org>]

tag 413506 + patch pending
severity 413506 serious
thanks

On Tue, 06 Mar 2007, Steffen Joeris wrote:
>   Placing packages into image 1
> Nested quantifiers in regex; marked by <-- HERE in m/^g++ <-- HERE $/ 
> at /home/builder/src/debian-edu/src/build/CD-administrator/debian-cd/tools/make_disc_trees.pl 
> line 246.
> make: *** [image-trees] Error 9
> 
> I am not quite sure what is going mad there and it is probably too late
> for me to do debugging, sorry.

Please try this patch (or svn update your debian-cd tree) and confirm me
that it fixes your problem.

I already committed it to debian-cd's svn.

I leave the severity at RC level because we need to make sure that
debian-cd 3.0.1 (unreleased) gets into etch, it has many fixes used for
generating the real official Debian CDs and we want this into etch.
I'll leave the upload up to Steve.

Regards,
-- 
Raphaël Hertzog

Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/

Index: tools/make_disc_trees.pl
===================================================================
--- tools/make_disc_trees.pl	(révision 1372)
+++ tools/make_disc_trees.pl	(copie de travail)
@@ -159,7 +159,7 @@
             foreach my $reinclude_pkg (@excluded_package_list) {
                 my ($arch, $pkgname) = split /:/, $reinclude_pkg;
                 foreach my $entry (@unexclude_packages) {
-                    if (($pkgname =~ /^$entry$/m)) {
+                    if (($pkgname =~ /^\Q$entry\E$/m)) {
                         print LOG "Re-including $reinclude_pkg due to match on \"\^$entry\$\"\n";
                         $guess_size = int($hfs_mult * add_packages($cddir, $reinclude_pkg));
                         $size += $guess_size;
@@ -243,7 +243,7 @@
     my $should_exclude = 0;
 
     foreach my $entry (@exclude_packages) {
-	    if (($pkgname =~ /^$entry$/m)) {
+	    if (($pkgname =~ /^\Q$entry\E$/m)) {
             print LOG "Excluding $pkg due to match on \"\^$entry\$\"\n";
             $should_exclude++;
         }
@@ -254,7 +254,7 @@
         # exclude the package at the same time. If so, complain and
         # bail out
         foreach my $entry (@unexclude_packages) {
-            if (($pkgname =~ /^$entry$/m)) {
+            if (($pkgname =~ /^\Q$entry\E$/m)) {
                 print LOG "But ALSO asked to unexclude $pkg due to match on \"\^$entry\$\"\n";
                 print LOG "Make your mind up! Bailing out...\n";
                 die "Incompatible exclude/unexclude entries for $pkg...\n";