Repos policy machinery: better docs, etc.

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e2f8edd05848c76f74e13c65d6561e39df1d1e48..6932d14a7d07f32ae57a8ef4005643c4be1ea903 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -23,17 +23,12 @@ our @EXPORT_OK;
 our $package_re = '[0-9a-z][-+.0-9a-z]*';
 our $branchprefix = 'dgit';
 
 our $package_re = '[0-9a-z][-+.0-9a-z]*';
 our $branchprefix = 'dgit';
 

-

 # policy hook exit status bits
 # policy hook exit status bits

-# any unexpected bits mean failure, and then known set bits are ignored
-
+# see dgit-repos-server head comment for documentation
+# 1 is reserved in case something fails with `exit 1'

 sub NOFFCHECK () { return 2; }
 sub NOFFCHECK () { return 2; }

-# suppress dgit-repos-server's ff check ("push" only)
-

 sub FRESHREPO () { return 4; }
 sub FRESHREPO () { return 4; }

-# blow away repo right away (ie, as if before push or fetch)
-# ("check-package" and "push" only)
-
+# 128 is reserved

 
 sub debiantag ($) { 
     my ($v) = @_;
 
 sub debiantag ($) { 
     my ($v) = @_;

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 5724c93895a72ceb058f427023afbb5b536b2027..c84fd7d4f3ff7c935466877b7903e301ebf6cdc8 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -1,23 +1,5 @@
 #!/usr/bin/perl -w
 # dgit repos policy hook script for Debian
 #!/usr/bin/perl -w
 # dgit repos policy hook script for Debian

-#
-# usages:
-#   dgit-repos-policy-debian DISTRO DGIT-REPOS-DIR ACTION...
-# ie.
-#   dgit-repos-policy-debian ... check-list [...]
-#   dgit-repos-policy-debian ... check-package PACKAGE [...]
-#   dgit-repos-policy-debian ... push PACKAGE \
-#         VERSION SUITE TAGNAME DELIBERATELIES [...]
-#   dgit-repos-policy-debian ... push-confirm PACKAGE \
-#         VERSION SUITE TAGNAME DELIBERATELIES [...]
-#
-# cwd for push is a temporary repo where the to-be-pushed objects have
-#  been received; TAGNAME is the version-based tag
-#
-# if push requested FRESHREPO, push-confirm happens in said fresh repo
-#
-# policy hook for a particular package will be invoked only once at
-# a time

 
 use strict;
 use POSIX;
 
 use strict;
 use POSIX;


@@ -31,7 +13,7 @@ our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
 our $action = shift @ARGV // die "need ACTION";
 
 our $publicmode = 02775;
 our $action = shift @ARGV // die "need ACTION";
 
 our $publicmode = 02775;

-our $policydb = "dbi:SQLite:$repos/policy";
+our $policydb = "dbi:SQLite:$repos/policy.sqlite3";

 our $new_upload_propagation_slop = 3600*4 + 100;
 
 our $poldbh;
 our $new_upload_propagation_slop = 3600*4 + 100;
 
 our $poldbh;


@@ -398,7 +380,9 @@ if (defined $pkg) {
 
 $cmd =~ y/-/_/;
 my $fn = ${*::}{"action__$cmd"};
 
 $cmd =~ y/-/_/;
 my $fn = ${*::}{"action__$cmd"};

-$fn or die "unknown ACTION";
+if (!$fn) {
+    exit 0;
+}

 
 poldb_setup();
 
 
 poldb_setup();
 

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 9c4859db4eba73f068e29d66c12d222388e95ae8..acff1727541491ace4bfc45ba4e56a63a7e40c84 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -34,6 +34,8 @@ use strict;
 #  PACKAGE_garbage                  }   (also covers executions of
 #  PACKAGE_garbage-old              }    policy hook script for PACKAGE)
 #  PACKAGE_garbage-tmp              }
 #  PACKAGE_garbage                  }   (also covers executions of
 #  PACKAGE_garbage-old              }    policy hook script for PACKAGE)
 #  PACKAGE_garbage-tmp              }

+#  policy*                          } (for policy hook script, covered by
+#                                   }  lock only when invoked for a package)

 #
 # leaf locks, held during brief operaton only:
 #
 #
 # leaf locks, held during brief operaton only:
 #


@@ -105,6 +107,35 @@ use strict;
 #    the corresponding temporary tree, as the lockfile is also
 #    a stampfile whose presence indicates that there may be
 #    cleanup to do
 #    the corresponding temporary tree, as the lockfile is also
 #    a stampfile whose presence indicates that there may be
 #    cleanup to do

+#
+# Policy hook script is invoked like this:
+#   POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR ACTION...
+# ie.
+#   POLICY-HOOK-SCRIPT ... check-list [...]
+#   POLICY-HOOK-SCRIPT ... check-package PACKAGE [...]
+#   POLICY-HOOK-SCRIPT ... push|push-confirm PACKAGE \
+#         VERSION SUITE TAGNAME DELIBERATELIES [...]
+#
+# Exit status is a bitmask.  Bit weight constants are defined in Dgit.pm.
+#    NOFFCHECK   (2)
+#         suppress dgit-repos-server's fast-forward check ("push" only)
+#    FRESHREPO   (4)
+#         blow away repo right away (ie, as if before push or fetch)
+#         ("check-package" and "push" only)
+# any unexpected bits mean failure, and then known set bits are ignored
+# if no unexpected bits set, operation continues (subject to meaning
+# of any expected bits set).  So, eg, exit 0 means "continue normally"
+# and would be appropriate for an unknown action.
+#
+# cwd for push and push-confirm is a temporary repo where the
+# to-be-pushed objects have been received; TAGNAME is the
+# version-based tag
+#
+# if push requested FRESHREPO, push-confirm happens in said fresh repo
+#
+# policy hook for a particular package will be invoked only once at
+# a time - (see comments about DGIT-REPOS-DIR, above)
+

 
 use POSIX;
 use Fcntl qw(:flock);
 
 use POSIX;
 use Fcntl qw(:flock);