Infra: Introduce Debian::Dgit::Infra

This is used by all the Perl in dgit-infrastructure.deb.
So far it does nothing, so no functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit/Infra.pm b/Debian/Dgit/Infra.pm
new file mode 100644 (file)
index 0000000..1f2c702
--- /dev/null
+++ b/Debian/Dgit/Infra.pm
@@ -0,0 +1,10 @@
+# -*- perl -*-
+
+package Debian::Dgit::Infra;
+
+use strict;
+use warnings;
+
+# push @INC, q{usr/share/dgit/infra/perl5}; ###substituted###
+
+1;

diff --git a/infra/dgit-repos-admin-debian b/infra/dgit-repos-admin-debian
index e19155d680dbfb23cb4c2ab027fc05e28805c438..6d1e4d03d686ce2df9c15494145eb7c829ffd4ca 100755 (executable)
--- a/infra/dgit-repos-admin-debian
+++ b/infra/dgit-repos-admin-debian
@@ -18,6 +18,7 @@
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit;
 setup_sigwarn();
 

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index ee369b06a8210a864a5127f9eaa8368b4d8b3fa5..8f1164b1f7a5705bda45bc5cc9f4417b42271f18 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -18,6 +18,7 @@
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit qw(:DEFAULT :policyflags);
 setup_sigwarn();
 

diff --git a/infra/dgit-repos-policy-trusting b/infra/dgit-repos-policy-trusting
index 0620b704be8aa8c932e9ae4e2aa13e0f9ebabd32..b551d5049ecfa316096e6976556c9853f0b36f7d 100755 (executable)
--- a/infra/dgit-repos-policy-trusting
+++ b/infra/dgit-repos-policy-trusting
@@ -38,7 +38,10 @@ delibs=$1    ; shift
 bitmask=0
 
 policyflags () {
-       perl -e 'use Debian::Dgit qw(:policyflags); print '$1',"\n"'
+       perl -e '
+               use Debian::Dgit::Infra;
+               use Debian::Dgit qw(:policyflags); print '$1',"\n"
+       '
 }
 
 set -e

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 1b3f661086919c0b6b379a705830ddbee260caa4..1be33609d486578b69a3fdeb2edd7b831b5c9c02 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -51,6 +51,7 @@
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit qw(:DEFAULT :policyflags);
 setup_sigwarn();
 

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index 17cf358ed88d00175a22ae33335e8741a90c6807..c5861d2d8b4223ca764e24f78df6223714ef7b47 100755 (executable)
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -18,6 +18,7 @@
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit;
 setup_sigwarn();