diff options
| author | ivan <ivan> | 2009-10-11 01:48:25 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-10-11 01:48:25 +0000 |
| commit | 8166c86a5e6312f88e84f9d9107ef11a99bf8545 (patch) | |
| tree | 865a91ea8ea157ad37fa8da367dc9369d0306f66 /rt/lib | |
| parent | ad8f95a4fa225465436e5e9d77bb3ab09b0fa931 (diff) | |
huh #2
Diffstat (limited to 'rt/lib')
| -rw-r--r-- | rt/lib/RT.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm index 0d0c0f509..22fb9a11c 100644 --- a/rt/lib/RT.pm +++ b/rt/lib/RT.pm @@ -68,7 +68,7 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger $MasonSessionDir ); -$VERSION = '3.6.4'; +$VERSION = '3.6.6'; $CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm"; $SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm"; @@ -161,12 +161,12 @@ EOF } eval { require $CORE_CONFIG_FILE }; if ($@) { - my ($fileuid,$filegid) = (stat($SITE_CONFIG_FILE))[4,5]; + my ($fileuid,$filegid) = (stat($CORE_CONFIG_FILE))[4,5]; my $fileusername = getpwuid($fileuid); my $filegroup = getgrgid($filegid); - my $errormessage = sprintf($message, $SITE_CONFIG_FILE, + my $errormessage = sprintf($message, $CORE_CONFIG_FILE, $fileusername, $filegroup, $filegroup); - die ("$errormessage '$CORE_CONFIG_FILE'\n$@") + die ("$errormessage\n$@") } # RT::Essentials mistakenly recommends that WebPath be set to '/'. @@ -459,6 +459,8 @@ ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname"); =cut +eval "require RT_Vendor"; +die $@ if ($@ && $@ !~ qr{^Can't locate RT_Vendor.pm}); eval "require RT_Local"; die $@ if ($@ && $@ !~ qr{^Can't locate RT_Local.pm}); |