From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Oct 2016 16:04:33 +0000 (+0100)
Subject: Infra: Introduce Debian::Dgit::Infra
X-Git-Tag: archive/debian/2.0~14
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=02bc0d2ca13bda7484c72b30cd20a7e36097da34;hp=55b092f4e1b4a3330fa367b6bf1da2fbca419085

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
index 00000000..1f2c702e
--- /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 e19155d6..6d1e4d03 100755
--- 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 ee369b06..8f1164b1 100755
--- 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 0620b704..b551d504 100755
--- 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 1b3f6610..1be33609 100755
--- 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 17cf358e..c5861d2d 100755
--- 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();