Changeset 27478

Timestamp:

2013-05-27T12:14:01+12:00 (11 years ago)

Author:

jmt12

Message:

Be a bit smarter about locating Perl version if not provided (rather than just dying)

File:

• gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/HDThriftFS.pm (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/HDThriftFS.pm

@@ -45 +45 @@
   die "GEXTPARALLELBUILDING not set\n" unless defined $ENV{'GEXTPARALLELBUILDING'};
   die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
+  # We need the Perl version before continuing
+  if (!defined $ENV{'PERL_VERSION'})
+  {
+    $ENV{'PERL_VERSION'} = `perl -S $ENV{'GEXTPARALLELBUILDING'}/bin/script/perl-version.pl`;
+  }
   die "PERL_VERSION not set\n" unless defined $ENV{'PERL_VERSION'};
   # Bit::Vector and Thrift modules
   unshift (@INC, $ENV{'GEXTPARALLELBUILDING'} . '/' . $ENV{'GSDLOS'} . '/lib/perl/' . $ENV{'PERL_VERSION'});
   # ThriftFS Perl API
-  unshift (@INC, $ENV{'GEXTPARALLELBUILDING'} . '/packages/hadoop-1.1.0/contrib/thriftfs/gen-perl');
+  unshift (@INC, $ENV{'GEXTPARALLELBUILDING'} . '/packages/ThriftFS-0.9.0/gen-perl');
 }