Turn all perl warnings into errors

[dgit.git] / infra / dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 93f6481e35a1a2a605adcb6f7a82bd615bd1a7e8..515501460a3ffb944fcb2ee4fb3049956922e403 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -26,6 +26,7 @@
 #   mDM.TXT
 
 use strict;
+$SIG{__WARN__} = sub { die $_[0]; };
 
 # DGIT-REPOS-DIR contains:
 # git tree (or other object)      lock (in acquisition order, outer first)
@@ -161,7 +162,6 @@ our $package;
 our $distro;
 our $suitesfile;
 our $policyhook;
-our $realdestrepo;
 our $destrepo;
 our $workrepo;
 our $keyrings;
@@ -177,6 +177,8 @@ sub debug {
     print DEBUG "$debug @_\n";
 }
 
+sub realdestrepo () { "$dgitrepos/$package.git"; }
+
 sub acquirelock ($$) {
     my ($lock, $must) = @_;
     my $fh;
@@ -215,7 +217,7 @@ sub locksometree ($) {
 }
 
 sub lockrealtree () {
-    locksometree($realdestrepo);
+    locksometree(realdestrepo);
 }
 
 sub mkrepotmp () {
@@ -287,7 +289,7 @@ sub mkrepo_fromtemplate ($) {
 }
 
 sub movetogarbage () {
-    # $realdestrepo must have been locked
+    # realdestrepo must have been locked
     my $garbagerepo = "$dgitrepos/${package}_garbage";
     # We arrange to always keep at least one old tree, for anti-rewind
     # purposes (and, I guess, recovery from mistakes).  This is either
@@ -301,7 +303,7 @@ sub movetogarbage () {
        }
        rename "$garbagerepo", "$garbagerepo-old" or die "$garbagerepo $!";
     }
-    rename $realdestrepo, $garbagerepo
+    rename realdestrepo, $garbagerepo
        or $! == ENOENT
        or die "$garbagerepo $!";
 }
@@ -347,7 +349,7 @@ sub dealwithfreshrepo () {
 }
 
 sub maybeinstallprospective () {
-    return if $destrepo eq $realdestrepo;
+    return if $destrepo eq realdestrepo;
 
     if (open REJ, "<", "$workrepo/drs-error") {
        local $/ = undef;
@@ -391,8 +393,8 @@ sub maybeinstallprospective () {
        movetogarbage;
     }
 
-    debug "install $destrepo => $realdestrepo";
-    rename $destrepo, $realdestrepo or die $!;
+    debug "install $destrepo => ".realdestrepo;
+    rename $destrepo, realdestrepo or die $!;
     remove "$destrepo.lock" or die $!;
 }
 
@@ -797,6 +799,50 @@ our @hookenvs = qw(distro suitesfile policyhook keyrings dgitrepos);
 
 # workrepo and destrepo handled ad-hoc
 
+sub mode_ssh () {
+    die if @ARGV;
+
+    my $cmd = $ENV{'SSH_ORIGINAL_COMMAND'};
+    $cmd =~ m{
+       ^
+       (?: \S* / )?
+       ( [-0-9a-z]+ )
+       \s+
+       '? (?: \S* / )?
+       ($package_re) \.git
+       '?$
+    }ox 
+    or reject "command string not understood";
+    my $method = $1;
+    $package = $2;
+
+    my $funcn = $method;
+    $funcn =~ y/-/_/;
+    my $mainfunc = $main::{"main__$funcn"};
+
+    reject "unknown method" unless $mainfunc;
+
+    my $lfh = lockrealtree();
+
+    $policy = policyhook(FRESHREPO,'check-package',$package);
+    if ($policy & FRESHREPO) {
+       movetogarbage;
+    }
+
+    close $lfh;
+
+    if (stat_exists realdestrepo) {
+       $destrepo = realdestrepo;
+    } else {
+       debug " fixmissing $funcn";
+       my $fixfunc = $main::{"fixmissing__$funcn"};
+       &$fixfunc;
+    }
+
+    debug " running main $funcn";
+    &$mainfunc;
+}
+
 sub parseargsdispatch () {
     die unless @ARGV;
 
@@ -842,48 +888,13 @@ sub parseargsdispatch () {
 
     $ENV{"DGIT_DRS_\U$_"} = ${ $main::{$_} } foreach @hookenvs;
 
-    die unless @ARGV==1 && $ARGV[0] eq '--ssh';
-
-    my $cmd = $ENV{'SSH_ORIGINAL_COMMAND'};
-    $cmd =~ m{
-       ^
-       (?: \S* / )?
-       ( [-0-9a-z]+ )
-       \s+
-       '? (?: \S* / )?
-       ($package_re) \.git
-       '?$
-    }ox 
-    or reject "command string not understood";
-    my $method = $1;
-    $package = $2;
-    $realdestrepo = "$dgitrepos/$package.git";
-
-    my $funcn = $method;
-    $funcn =~ y/-/_/;
-    my $mainfunc = $main::{"main__$funcn"};
+    die unless @ARGV==1;
 
-    reject "unknown method" unless $mainfunc;
-
-    my $lfh = lockrealtree();
-
-    $policy = policyhook(FRESHREPO,'check-package',$package);
-    if ($policy & FRESHREPO) {
-       movetogarbage;
-    }
-
-    close $lfh;
-
-    if (stat_exists $realdestrepo) {
-       $destrepo = $realdestrepo;
-    } else {
-       debug " fixmissing $funcn";
-       my $fixfunc = $main::{"fixmissing__$funcn"};
-       &$fixfunc;
-    }
-
-    debug " running main $funcn";
-    &$mainfunc;
+    my $mode = shift @ARGV;
+    die unless $mode =~ m/^--(\w+)$/;
+    my $fn = ${*::}{"mode_$1"};
+    die unless $fn;
+    $fn->();
 }
 
 sub unlockall () {