From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 2 Jan 2018 01:14:26 +0000 (-0800)
Subject: output more debugging information; just use componentdir
X-Git-Tag: release/2.6.0~37
X-Git-Url: https://git.donarmstrong.com/debbugs.git/?a=commitdiff_plain;h=ba2e9b7449c9ed048c013e60553698ea4119e49b;p=debbugs.git

output more debugging information; just use componentdir
---

diff --git a/examples/debian/versions/build-versions-db b/examples/debian/versions/build-versions-db
index 51c63aa..d4edbea 100755
--- a/examples/debian/versions/build-versions-db
+++ b/examples/debian/versions/build-versions-db
@@ -191,25 +191,34 @@ for my $suite (@{$suites}) {
 		       'non-free', 'non-free/debian-installer',
 		      ) {
 	my $componentdir = "$suitedir/$component";
-	next unless -d $componentdir;
+	if (not -d $componentdir) {
+	    print STDERR "No directory $suitedir/$component\n" if $DEBUG;
+	    next;
+	}
 	my $COMPONENT;
 	opendir $COMPONENT, $componentdir or die "opendir $componentdir: $!";
 
 	# debian-installer is really a section rather than a component
 	# (ugh).
-	(my $viscomponent = $component) =~ s[/.*][];
+	$component =~ s[/.*][];
 
-	my $sources = (grep { -f $_ } glob "$suitedir/$component/source/Sources.*")[0];
-	next unless defined $sources;
-	read_packages($db,$db2,$sources, $viscomponent,'source',$suite);
+	my $sources = (grep { -f $_ } glob "$componentdir/source/Sources.*")[0];
+	if (not defined $sources) {
+	    print STDERR "No sources matching $componentdir/source/Sources.*\n" if $DEBUG;
+	    next;
+	}
+	read_packages($db,$db2,$sources, $component,'source',$suite);
 
 	for my $arch (readdir $COMPONENT) {
 	    next unless $arch =~ s/^binary-//;
 	    my $archdir = "$componentdir/binary-$arch";
 
 	    my $packages = (grep { -f $_ } glob("$archdir/Packages.*"))[0];
-	    next unless defined $packages;
-	    read_packages($db,$db2,$packages, $viscomponent,$arch,$suite);
+	    if (not defined $packages) {
+		print STDERR "No binary packages matching $archdir/Packages.*\n" if $DEBUG;
+		next;
+	    }
+	    read_packages($db,$db2,$packages, $component,$arch,$suite);
 	}
 
 	closedir $COMPONENT or