summaryrefslogtreecommitdiff
path: root/modules/Driver.pm
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2009-09-08 00:52:25 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2009-09-08 00:52:25 +0000
commitd05e5a84601ff7662b97ec47bd747d5ea01303f0 (patch)
treee8203b174a43f7a9983782f84a929447f4d5c613 /modules/Driver.pm
parentfa5f985c4c9cb6b5e563a5c4066f5358e4708d17 (diff)
downloadMPC-d05e5a84601ff7662b97ec47bd747d5ea01303f0.tar.gz
ChangeLogTag: Tue Sep 8 00:48:45 UTC 2009 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'modules/Driver.pm')
-rw-r--r--modules/Driver.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/Driver.pm b/modules/Driver.pm
index 7110a3ba..231c7cf6 100644
--- a/modules/Driver.pm
+++ b/modules/Driver.pm
@@ -431,7 +431,16 @@ sub run {
my $global_feature_file = (defined $options->{'gfeature_file'} &&
-r $options->{'gfeature_file'} ?
$options->{'gfeature_file'} : undef);
- if (!defined $global_feature_file) {
+ if (defined $global_feature_file) {
+ ## If the specified path is relative, expand it based on
+ ## the current working directory.
+ if ($global_feature_file !~ /^[\/\\]/ &&
+ $global_feature_file !~ /^[A-Za-z]:[\/\\]?/) {
+ $global_feature_file = DirectoryManager::getcwd() . '/' .
+ $global_feature_file;
+ }
+ }
+ else {
my $gf = 'global.features';
$global_feature_file = $self->find_file($options->{'include'}, $gf);
if (!defined $global_feature_file) {