[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.3-57-g3a7f27a

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  3a7f27a83d30ebf5bdd0ead9550fd2f0475a614a (commit)
       via  bbcae535685e91e5fa29f7b6c82e481816d404e5 (commit)
      from  ed1dd75fdc6b9a9f6ca662c9deb6ea6127783779 (commit)

Summary of changes:
 sbin/rt-server.in | 3 +++
 1 file changed, 3 insertions(+)

- Log -----------------------------------------------------------------
commit bbcae535685e91e5fa29f7b6c82e481816d404e5
Author: Dominic Hargreaves <dom at earth.li>
Date:   Fri Mar 21 15:52:36 2014 -0400

    Ensure there is not a mismatch between sbin/ and lib/ on server startup
    
    see 24424172b1e276d291297abf8343eddd18480266 from 3.8-trunk

diff --git a/sbin/rt-server.in b/sbin/rt-server.in
index ab6d5fe..6bb4b47 100644
--- a/sbin/rt-server.in
+++ b/sbin/rt-server.in
@@ -84,6 +84,9 @@ if (grep { m/help/ } @ARGV) {
 }
 
 require RT;
+die "Wrong version of RT $RT::VERSION found; need @RT_VERSION_MAJOR at .@RT_VERSION_MINOR at .*"
+    unless $RT::VERSION =~ /^@RT_VERSION_MAJOR@\. at RT_VERSION_MINOR@\./;
+
 RT->LoadConfig();
 RT->InitPluginPaths();
 RT->InitLogging();

commit 3a7f27a83d30ebf5bdd0ead9550fd2f0475a614a
Merge: ed1dd75 bbcae53
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Mar 21 15:52:53 2014 -0400

    Merge branch '4.2/check-rt-lib-version' into 4.2-trunk


-----------------------------------------------------------------------