[debhelper-devel] [debhelper] 01/02: Dh_Lib: Fix regression in parsing of the source section

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 9dadeeedef26f040c7aa1709200287c416e707f5
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Oct 24 16:33:15 2017 +0000

    Dh_Lib: Fix regression in parsing of the source section
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog               | 4 ++++
 lib/Debian/Debhelper/Dh_Lib.pm | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1951e02..6417033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ debhelper (10.10.4) UNRELEASED; urgency=medium
     expects uncompressed debug symbols).  (Closes: #878888)
   * dwz.pm: New sequence to add dh_dwz to the sequence.
   * d/control: Add a Suggets on dwz for the optional dh_dwz tool.
+  * Dh_Lib.pm: Fix regression where the source section would not
+    be parsed leading to dbgsym packages possibly getting an
+    incorrect value in the Section field.  Thanks to Mihai
+    Moldovan for reporting the issue.  (Closes: #879667)
 
  -- Niels Thykier <niels at thykier.net>  Tue, 24 Oct 2017 05:45:09 +0000
 
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index 2ee29c1..1fbcb10 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -1351,6 +1351,9 @@ sub getpackages {
 				$rrr{$keyword} = 1;
 			}
 			next;
+		} elsif (/^Section:\s(.*)$/i) {
+			$source_section = $1;
+			next;
 		}
 		last if (!$_ or eof); # end of stanza.
 	}
@@ -1414,8 +1417,6 @@ sub getpackages {
 						push(@{$packages_by_type{'both'}}, $package);
 					}
 				}
-			} elsif ($section and not defined($source_section)) {
-				$source_section = $section;
 			}
 			$package='';
 			$package_type=undef;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git