the libraries are now in the lib directory

[debbugs.git] / bin / debbugs-loadsql

diff --git a/bin/debbugs-loadsql b/bin/debbugs-loadsql
index a1b75de2a0202c47cf19801462e1703f2e090c0e..c28d66e99a7cf3f86cbc6ceb5a0682748825b321 100755 (executable)
--- a/bin/debbugs-loadsql
+++ b/bin/debbugs-loadsql
@@ -136,10 +136,11 @@ use vars qw($DEBUG);
 # non-absolute INC, don't do that.
 use FindBin;
 use if (-d $FindBin::Bin.'/../.git/' && $INC[0] =~ m#^/#),
-    lib => $FindBin::Bin.'/../';
+    lib => $FindBin::Bin.'/../lib';
 
 use Debbugs::Common (qw(checkpid lockpid get_hashname getparsedaddrs),
                     qw(getbugcomponent make_list getsourcemaintainers),
+                    qw(getbuglocation),
                     qw(walk_bugs),
                     qw(hash_slice open_compressed_file),);
 use Debbugs::Config qw(:config);
@@ -165,7 +166,7 @@ my %options =
      verbose         => 0,
      quiet           => 0,
      quick           => 0,
-     service         => $config{debbugs_db},
+     service         => $config{database},
      progress        => 0,
     );
 
@@ -437,12 +438,13 @@ FILE:     for my $file (@v) {
                    not defined $srcver or
                    not defined $binname or
                    not defined $binver or
+                   not defined $binarch or
                    $srcname !~ /^$config{package_name_re}$/o or
                    $binname !~ /^$config{package_name_re}$/o or
                    $srcver !~ /^$config{package_version_re}$/o or
                    $binver !~ /^$config{package_version_re}$/o
                   ) {
-                   print STDERR "malformed debinfo: $file\n";
+                   print STDERR "malformed debinfo: $file\n$_\n";
                    next FILE;
                }
                push @file_debinfos,