From b07bd7dcd718ed4a9a04d8010b74100d864c80bc Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Sat, 29 Jul 2006 03:34:00 +0000
Subject: Bug 346343: Clean up all of checksetup prior to localconfig code
 Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=myk

---
 Bugzilla/Constants.pm            | 6 ++++++
 Bugzilla/Install/Requirements.pm | 4 ++++
 2 files changed, 10 insertions(+)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 0bbbfa7d5..15595c269 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -110,6 +110,7 @@ use File::Basename;
 
     DB_MODULE
     ROOT_USER
+    ON_WINDOWS
 );
 
 @Bugzilla::Constants::EXPORT_OK = qw(contenttypes);
@@ -299,8 +300,13 @@ use constant DB_MODULE => {
                 name => 'PostgreSQL'},
 };
 
+# The user who should be considered "root" when we're giving
+# instructions to Bugzilla administrators.
 use constant ROOT_USER => $^O =~ /MSWin32/i ? 'Administrator' : 'root';
 
+# True if we're on Win32.
+use constant ON_WINDOWS => ($^O =~ /MSWin32/i);
+
 sub bz_locations {
     # We know that Bugzilla/Constants.pm must be in %INC at this point.
     # So the only question is, what's the name of the directory
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 6d119044c..8893b0ff8 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -220,6 +220,10 @@ sub check_requirements {
             have_vers($module->{name}, $module->{version}, $output);
     }
 
+    # If we're running on Windows, reset the input line terminator so that
+    # console input works properly - loading CGI tends to mess it up
+    $/ = "\015\012" if ON_WINDOWS;
+
     if ($output) {
         print "\n";
 
-- 
cgit v1.2.3-24-g4f1b