chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Fix a typo
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index ac427127464f4c932baa460a9e8ad170626d552f..8a105366211754a5d04541bdd0d0d33724a465e6 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-20,6
+20,7
@@
enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
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 $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;
our $action = shift @ARGV // die "need ACTION";
our $publicmode = 02775;
@@
-111,10
+112,6
@@
sub specific_suite_has_vsn_in_our_history ($) {
}
sub new_has_vsn_in_our_history () {
}
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');
}
return specific_suite_has_vsn_in_our_history('new');
}
@@
-150,21
+147,28
@@
sub getpackage () {
}
sub add_taint ($$) {
}
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 $!;
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 $!;
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>;
die $!;
}
close $tf or die $!;
$_ = <GCF>;
+ defined $_ or die;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
@@
-178,7
+182,7
@@
sub add_taint ($$) {
close GCF;
$poldbh->do("INSERT INTO taints".
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);
" VALUES (?,?,?,?,?,?)", {},
$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
@@
-186,9
+190,9
@@
sub add_taint ($$) {
die unless defined $taint_id;
$poldbh->do("INSERT INTO taintoverrides".
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 ($$) {
}
sub add_taint_by_tag ($$) {
@@
-204,14
+208,26
@@
sub action_check_package () {
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
+ printdebug "check_package\n";
+
chdir $pkgdir or die "$pkgdir $!";
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;
}
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);
git_for_each_ref('refs/tags', sub {
my ($objid,$objtype,$fullrefname,$tagname) = @_;
add_taint_by_tag($tagname,$objid);
@@
-235,6
+251,8
@@
sub deliberately ($) { return $deliberately{$_[0]}; }
sub action_push () {
getpackage();
sub action_push () {
getpackage();
+ getpushinfo();
+
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
@@
-259,8
+277,9
@@
sub action_push () {
sub action_push_confirm () {
getpackage();
sub action_push_confirm () {
getpackage();
- die unless @ARGV >= 5;
- my $freshrepo = $ARGV[4];
+ getpushinfo();
+ die unless @ARGV >= 1;
+ my $freshrepo = shift @ARGV;
my $initq = $poldbh->prepare(<<END);
SELECT taint_id, gitobjid FROM taints t
my $initq = $poldbh->prepare(<<END);
SELECT taint_id, gitobjid FROM taints t
@@
-286,10
+305,11
@@
END
my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
my $overridesstmt = <<END;
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;
END
my @overridesv = sort keys %deliberately;
- $overridesstmt .=
join '', (<<END x @overridesv)
;
+ $overridesstmt .=
<<END foreach @overridesv
;
OR deliberately = ?
END
$overridesstmt .= <<END;
OR deliberately = ?
END
$overridesstmt .= <<END;
@@
-335,6
+355,8
@@
Taint recorded$timeshow for $pkgshow
Reason: $ti->{comment}
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();
$overridesq ||= $poldbh->prepare($overridesstmt);
$overridesq->execute(@overridesv, $taintid);
my ($ovwhy) = $overridesq->fetchrow_array();
@@
-381,6
+403,7
@@
END
printdebug sprintf "chmod %#o (was %#o) %s\n",
$newmode, $oldmode, $freshrepo;
chmod $newmode, $freshrepo or die $!;
printdebug sprintf "chmod %#o (was %#o) %s\n",
$newmode, $oldmode, $freshrepo;
chmod $newmode, $freshrepo or die $!;
+ utime undef, undef, $freshrepo or die $!;
}
}
}
}