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

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit cc80ba4fc942db8abe95442432971710fbcce33c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Nov 10 12:34:37 2016 +0100

    Adjusted blend-gen-control to handle RFC822 style continuation lines as well as backslash style (Closes: #840094).  Patch by Ole Streicher.

diff --git a/debian/changelog b/debian/changelog
index cdfdd61..13df278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+blends (0.6.95) UNRELEASED; urgency=medium
+
+  [ Petter Reinholdtsen ]
+  * Adjusted blend-gen-control to handle RFC822 style continuation
+    lines as well as backslash style (Closes: #840094).  Patch by Ole
+    Streicher.
+
+ -- Ole Streicher <olebole at debian.org>  Mon, 12 Sep 2016 09:40:48 +0200
+
 blends (0.6.94) unstable; urgency=medium
 
   [ Ole Streicher ]
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 1aba552..cde3237 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -566,9 +566,14 @@ sub load_task {
         my $header;
         for $header (qw(Depends Recommends Suggests)) {
             if (m/^$header:\s+(.+)$/ && $1 !~ /^\s*$/) {
+		my $pkgs = $1;
+		while (<TASKFILE>) {
+		    last if (m/^\S+/ || m/^\s*$/);
+		    $pkgs .= $_;
+		}
                 $taskinfo{$curpkg}{$header} = ()
                     if (! exists $taskinfo{$curpkg}{$header});
-                my ($pkglist, $missinglist) = process_pkglist($1);
+                my ($pkglist, $missinglist) = process_pkglist($pkgs);
                 push(@{$taskinfo{$curpkg}{$header}}, @{$pkglist});
 
 		$haspackages += $#{$taskinfo{$curpkg}{$header}} + 1;

-- 
Git repository for blends code