use File::stat;
use File::Basename;
use File::Spec;
+use File::Find;
use IO::Dir;
use IO::File;
use IO::Uncompress::AnyUncompress;
use Encode qw(decode_utf8);
-use List::MoreUtils qw(natatime);
+use List::AllUtils qw(natatime);
my %options =
(debug => 0,
GetOptions(\%options,
'quick|q',
'service|s=s',
+ 'dsn=s',
'sysconfdir|c=s',
'progress!',
'spool_dir|spool-dir=s',
'versions' => {function => \&add_versions,
},
'debinfo' => {function => \&add_debinfo,
- arguments => {'0|null' => 0},
+ arguments => {'0|null' => 0,
+ 'debinfo_dir|debinfo-dir=s' => 0,
+ },
},
'maintainers' => {function => \&add_maintainers,
},
my $s = db_connect($options);
- my $time = 0;
- my $start_time = time;
my %tags;
my %severities;
my %queue;
my ($options,$opts,$p,$config,$argv) = @_;
my @files = @{$argv};
+ if (exists $opts->{debinfo_dir} and not @files) {
+ find(sub {
+ if (-f $_ and /\.debinfo$/) {
+ push @files, $File::Find::name;
+ }
+ },
+ $opts->{debinfo_dir}
+ );
+ }
if (not @files) {
{
local $/ = "\n";
while (my @v = $it->()) {
my %cache;
my @debinfos;
- for my $file (@v) {
+FILE: for my $file (@v) {
my $fh = IO::File->new($file,'r') or
die "Unable to open $file for reading: $!";
my $f_stat = stat($file);
my $ct_date = DateTime->from_epoch(epoch => $f_stat->ctime);
+ my @file_debinfos;
while (<$fh>) {
chomp;
next unless length $_;
# the file, so we'll fudge it from the filename.
if (not defined $srcver) {
($srcname,$srcver) = ($binarch,$srcname);
- ($binarch) = $file =~ /_([^\.]+)\.debinfo/;
+ ($binarch) = $file =~ /_([a-z0-9-]+)\.debinfo/;
}
- if (not defined $srcver) {
- print STDERR "malformed debinfo (no srcver): $file\n";
- next;
+ # It turns out that there are debinfo files which are horribly
+ # screwed up, and have junk in them. We need to discard them
+ # completely
+ if (not defined $srcname or
+ not defined $srcver or
+ not defined $binname or
+ not defined $binver 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";
+ next FILE;
}
- push @debinfos,
+ push @file_debinfos,
[$binname,$binver,$binarch,$srcname,$srcver,$ct_date];
}
+ push @debinfos,
+ @file_debinfos;
}
$s->txn_do(
sub {
my ($options,$opts,$p,$config,$argv) = @_;
my $s = db_connect($options);
- my $maintainers = getsourcemaintainers();
+ my $maintainers = getsourcemaintainers() // {};
$p->target(2) if $p;
## get all of the maintainers, and add the missing ones
my $maints = $s->resultset('Maintainer')->
get_maintainers(values %{$maintainers});
- $p->update();
+ $p->update() if $p;
my @svs = $s->resultset('SrcVer')->
search({maintainer => undef
},
}
my $s = db_connect($options);
-
- my $time = 0;
- my $start_time = time;
-
walk_bugs([(@{$argv}?@{$argv} : $initialdir)],
$p,
'log',
my ($options) = @_;
# connect to the database; figure out how to handle errors
# properly here.
- my $s = Debbugs::DB->connect($options->{service}) or
+ my $s = Debbugs::DB->connect($options->{dsn} //
+ $options->{service}) or
die "Unable to connect to database: ";
}