Changeset 30357 for main/trunk

Timestamp:

2015-12-18T20:46:01+13:00 (8 years ago)

Author:

jmt12

Message:

Wrapped the code that checks the path for the perllib in a 'not-windows' test, as something about the drive path breaks the Perl's regular expression engine

File:

• main/trunk/greenstone2/perllib/dbutil.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/dbutil.pm

@@ -37 +37 @@
     }
     # Are we running standalone? In which case the INC won't be correct
-    my $perllib_path = $ENV{'GSDLHOME'} . '/perllib';
-    my $all_inc = join(':', @INC);
-    if ($all_inc !~ /$perllib_path/) {
-    unshift(@INC, $perllib_path);
-    unshift(@INC, $ENV{'GSDLHOME'} . '/ext/parallel-building/perllib');
-    unshift(@INC, $ENV{'GSDLHOME'} . '/ext/tdb/perllib');
+    # - derp. Linux only sorry
+    if ($^O !~ /cygwin|MSWin32/) {
+    my $perllib_path = $ENV{'GSDLHOME'} . '/perllib';
+    my $all_inc = join(':', @INC);
+    if ($all_inc !~ /$perllib_path/) {
+        unshift(@INC, $perllib_path);
+        unshift(@INC, $ENV{'GSDLHOME'} . '/ext/parallel-building/perllib');
+        unshift(@INC, $ENV{'GSDLHOME'} . '/ext/tdb/perllib');
+    }
     }
     ## You can uncomment and name a Driver here to test it compiles