[Blends-commit] [SCM] blends-dev branch, master, updated. fa25cc529d34d6ff322bb432ccd31fc1819a5a07

[Mike Gabriel]

The following commit has been merged in the master branch:
commit fa25cc529d34d6ff322bb432ccd31fc1819a5a07
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Aug 5 00:02:27 2017 -0400

    Consolidate package name extraction even more, fix breakage for make dist run against debian-edu (v1.924 and earlier.

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index b6c0b7f..45a2cad 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -544,6 +544,7 @@ sub load_task {
         # Remove trailing space
         $line =~ s/\s+$//;
 
+
         $_ = $line;
         for my $header (qw(Section Architecture Priority Leaf Enhances Metapackage Install)) {
             $taskinfo{$curpkg}{$header} = $1 if (m/^$header:\s+(.+)$/);
@@ -573,8 +574,12 @@ sub load_task {
             if (m/^$header:\s+(.+)$/ && $1 !~ /^\s*$/) {
                 $pkgs .= $1;
 
+                # remove blanks near kommas and pipe symbols
+                $pkgs =~ s/\s*,\s*/,/g;
+                $pkgs =~ s/\s*\|\s*/|/g;
+
                 # reliable whitespace and backslash cleanup
-                $pkgs =~ s/^\s+([^\s]+)\s*(|\\\s*)$/$1/;
+                $pkgs =~ s/^\s*([a-z0-9\_\.\|+,-]+)\s*(|\\\s*)$/$1/;
             }
 
             # or no package in the header line ('<header>':<LF>)
@@ -588,7 +593,7 @@ sub load_task {
 
                     # reliable whitespace and backslash cleanup around
                     # package name
-                    $_ =~ s/^\s+([^\s]+)\s*(|\\\s*)$/$1/;
+                    $_ =~ s/^\s*([a-zA-Z0-9\_\.\|+,-]+)\s*(|\\\s*)$/$1/;
                     $pkgs .= $_;
                 }
 

-- 
Git repository for blends code