From 0c01db9069e20a7ccfba9d1aaa7db08144843598 Mon Sep 17 00:00:00 2001 From: Scott Walters Date: Sun, 11 Nov 2012 23:16:05 -0500 Subject: [PATCH] Revert "testenvironment does not check for correct perl version (#12377)" ... apparently this was either already done or done separately This reverts commit b009dc7b5a238615c4c7d48af7be423c813db763. Conflicts: docs/changelog/8.x.x.txt --- docs/changelog/8.x.x.txt | 1 - sbin/testEnvironment.pl | 9 --------- 2 files changed, 10 deletions(-) diff --git a/docs/changelog/8.x.x.txt b/docs/changelog/8.x.x.txt index 11a6d816e..0ca6d0733 100644 --- a/docs/changelog/8.x.x.txt +++ b/docs/changelog/8.x.x.txt @@ -1,5 +1,4 @@ 8.0.1 - - #12377 - add verbiage about requiring a post Apollo era perl if such a perl is detected - #11849 - Use a different image library -- partially implemented; WebGUI::Image still uses Image::Magick 8.0.0 diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl index 29c2f3056..93976aeeb 100755 --- a/sbin/testEnvironment.pl +++ b/sbin/testEnvironment.pl @@ -16,15 +16,6 @@ use File::Spec; my $webguiRoot; BEGIN { - if( $] < 5.010 ) { - print <rel2abs(File::Spec->catdir(File::Basename::dirname(__FILE__), File::Spec->updir)); unshift @INC, File::Spec->catdir($webguiRoot, 'lib'); }