From c2391b796bf9f519291f8597801dca2155ba250b Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Wed, 2 Apr 2014 17:20:08 +1300 Subject: [PATCH] Bug 12023 - move InstallAuth.pm to be in C4 InstallAuth was in the installer directory, which meant that Plack was unable to find it, and so running the webinstaller would fail. This moves it into C4, Test plan: * Make sure the web installer runs under plack * Make sure the web installer runs under non-plack Signed-off-by: Brendan Gallagher Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- {installer => C4}/InstallAuth.pm | 5 +---- installer/install.pl | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) rename {installer => C4}/InstallAuth.pm (99%) diff --git a/installer/InstallAuth.pm b/C4/InstallAuth.pm similarity index 99% rename from installer/InstallAuth.pm rename to C4/InstallAuth.pm index 0015a14e2d..5f0d51d3d6 100644 --- a/installer/InstallAuth.pm +++ b/C4/InstallAuth.pm @@ -1,7 +1,4 @@ -# -*- tab-width: 8 -*- -# NOTE: This file uses 8-character tabs; do not change the tab size! - -package InstallAuth; +package C4::InstallAuth; # Copyright 2000-2002 Katipo Communications # diff --git a/installer/install.pl b/installer/install.pl index c9c1361976..e2ee3729f1 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -4,7 +4,7 @@ use strict; use warnings; use diagnostics; -use InstallAuth; +use C4::InstallAuth; use CGI; use IPC::Cmd;