From a844a562081aab9ae8489c293d2f38026b6e87b1 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 5 Jul 2017 18:17:02 -0700 Subject: [PATCH] skip maintainer files if they are empty *or* undef --- Debbugs/Common.pm | 7 ++++--- Debbugs/Packages.pm | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm index 2bc3e0d..9305d3f 100644 --- a/Debbugs/Common.pm +++ b/Debbugs/Common.pm @@ -364,7 +364,7 @@ sub package_maintainer { for my $fn (@config{('source_maintainer_file', 'source_maintainer_file_override', 'pseudo_maint_file')}) { - next unless defined $fn; + next unless defined $fn and length $fn; if (not -e $fn) { warn "Missing source maintainer file '$fn'"; next; @@ -380,7 +380,7 @@ sub package_maintainer { for my $fn (@config{('maintainer_file', 'maintainer_file_override', 'pseudo_maint_file')}) { - next unless defined $fn; + next unless defined $fn and length $fn; if (not -e $fn) { warn "Missing maintainer file '$fn'"; next; @@ -471,7 +471,8 @@ sub getpseudodesc { return $_pseudodesc if defined $_pseudodesc; $_pseudodesc = {}; __add_to_hash($config{pseudo_desc_file},$_pseudodesc) if - defined $config{pseudo_desc_file}; + defined $config{pseudo_desc_file} and + length $config{pseudo_desc_file}; return $_pseudodesc; } diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm index 27117ab..6974c17 100644 --- a/Debbugs/Packages.pm +++ b/Debbugs/Packages.pm @@ -72,7 +72,8 @@ our $_pkgcomponent; our $_srcpkg; sub getpkgsrc { return $_pkgsrc if $_pkgsrc; - return {} unless defined $Debbugs::Packages::gPackageSource; + return {} unless defined $config{package_source} and + length $config{package_source}; my %pkgsrc; my %pkgcomponent; my %srcpkg; -- 2.39.2