Francois Gouget : testbot: Document the move of the ConfigLocal.pl file.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 180ef4eba16f09400fbe1ab9c1e1b8dabc84145f
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=180ef4eba16f09400fbe1ab9c...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon Dec 17 09:57:23 2012 +0100

testbot: Document the move of the ConfigLocal.pl file.

---

 testbot/doc/INSTALL.txt           |    4 ++--
 testbot/lib/WineTestBot/Config.pm |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt
index 95b2a08..b780de0 100644
--- a/testbot/doc/INSTALL.txt
+++ b/testbot/doc/INSTALL.txt
@@ -49,8 +49,8 @@ General setup for the web site:
 - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and
   user name if necessary. Then activate it.
   (typically "chkconfig winetestbot on" or "service winetestbot start")
-- Copy lib/WineTestBot/ConfigLocalTemplate.pl to
-  lib/WineTestBot/ConfigLocal.pl and fill in the options for your site.
+- Copy lib/WineTestBot/ConfigLocalTemplate.pl to ConfigLocal.pl in TestBot's
+  root directory and fill in the options for your site.
 - Restart Apache, you should now be able to browse to the home page.
 - Register a new account for yourself.
 - Using the mysql client, set the ResetCode in your Users entry to a
diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm
index 8d96c36..bb1cabb 100644
--- a/testbot/lib/WineTestBot/Config.pm
+++ b/testbot/lib/WineTestBot/Config.pm
@@ -88,12 +88,12 @@ $JobArchiveDays = 0;
 if (!$::BuildEnv)
 {
   $::BuildEnv = 0;
-  eval 'require "$::RootDir/ConfigLocal.pl";';
+  eval 'require "$::RootDir/ConfigLocal.pl"';
   if ($@)
   {
-    print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " .
+    print STDERR "Please create a valid $::RootDir/ConfigLocal.pl file; " .
         "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n";
-    exit;
+    exit 1;
   }
 
   require ObjectModel::DBIBackEnd;