our $distro = shift @ARGV // die "need DISTRO";
our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR";
+our $distrodir = shift @ARGV // die "need DISTRO-DIR";
our $action = shift @ARGV // die "need ACTION";
our $publicmode = 02775;
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
$!=0; $?=0; my $json = `$cmd`;
- defined $json or die "$subpath $! $?";
+ defined $json && !$? or die "$subpath $! $?";
my $r = decode_json $json;
my $d = new Data::Dumper([$r], [qw(r)]);
printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;
}
sub new_has_vsn_in_our_history () {
- stat $pkgdir or die "$pkgdir $!";
- my $mtime = ((stat _)[9]);
- my $age = time - $mtime;
- return 1 if $age < $new_upload_propagation_slop;
return specific_suite_has_vsn_in_our_history('new');
}
}
sub add_taint ($$) {
- my ($refobj, $reason);
+ my ($refobj, $reason) = @_;
+
+ printdebug "TAINTING $refobj\n",
+ (map { "\%| $_" } split "\n", $reason),
+ "\n";
my $tf = new File::Temp or die $!;
print $tf "$refobj^0\n" or die $!;
+ flush $tf or die $!;
+ seek $tf,0,0 or die $!;
my $gcfpid = open GCF, "-|";
defined $gcfpid or die $!;
if (!$gcfpid) {
open STDIN, "<&", $tf or die $!;
- exec 'git', 'cat-file';
+ exec 'git', 'cat-file', '--batch';
die $!;
}
close $tf or die $!;
$_ = <GCF>;
+ defined $_ or die;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
close GCF;
$poldbh->do("INSERT INTO taints".
- " (package, gitobjid, gitobjtype, gitobjdata, time, comment)",
+ " (package, gitobjid, gitobjtype, gitobjdata, time, comment)".
" VALUES (?,?,?,?,?,?)", {},
$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
die unless defined $taint_id;
$poldbh->do("INSERT INTO taintoverrides".
- " (taint_id, deliberately)",
- " VALUES (?, 'include-questionable-history')", {},
- $taint_id);
+ " (taint_id, deliberately)".
+ " VALUES (?, '--deliberately-include-questionable-history')",
+ {}, $taint_id);
}
sub add_taint_by_tag ($$) {
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
+ printdebug "check_package\n";
+
chdir $pkgdir or die "$pkgdir $!";
- return if new_has_vsn_in_our_history();
+
+ stat '.' or die "$pkgdir $!";
+ my $mtime = ((stat _)[9]);
+ my $age = time - $mtime;
+ printdebug "check_package age=$age\n";
+
+ return 0 if $age < $new_upload_propagation_slop;
+
+ return 0 if new_has_vsn_in_our_history();
if (good_suite_has_vsn_in_our_history) {
chmod $publicmode, "." or die $!;
return 0;
}
+ printdebug "check_package secret, deleted, tainting\n";
+
git_for_each_ref('refs/tags', sub {
my ($objid,$objtype,$fullrefname,$tagname) = @_;
add_taint_by_tag($tagname,$objid);
my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
my $overridesstmt = <<END;
- SELECT deliberately FROM taintoverrides WHERE ( 1
+ SELECT deliberately FROM taintoverrides WHERE (
+ 1=0
END
my @overridesv = sort keys %deliberately;
- $overridesstmt .= join '', (<<END x @overridesv);
+ $overridesstmt .= <<END foreach @overridesv;
OR deliberately = ?
END
$overridesstmt .= <<END;
Reason: $ti->{comment}
END
+ printdebug "SQL overrides: @overridesv $taintid /\n$overridesstmt\n";
+
$overridesq ||= $poldbh->prepare($overridesstmt);
$overridesq->execute(@overridesv, $taintid);
my ($ovwhy) = $overridesq->fetchrow_array();
printdebug sprintf "chmod %#o (was %#o) %s\n",
$newmode, $oldmode, $freshrepo;
chmod $newmode, $freshrepo or die $!;
+ utime undef, undef, $freshrepo or die $!;
}
}