summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-01-24 04:46:00 +0000
committerfukachan <fukachan>2001-01-24 04:46:00 +0000
commit3250a6e7addbab9c2a76b03dae5cc98611ac2f03 (patch)
tree7da508a456668bf8b4f2871982deb33fce301188
parent8a575043e66ef7a2af6b9858adeb3a6152964803 (diff)
downloadfml8-3250a6e7addbab9c2a76b03dae5cc98611ac2f03.tar.gz
fml8-3250a6e7addbab9c2a76b03dae5cc98611ac2f03.tar.bz2
fml8-3250a6e7addbab9c2a76b03dae5cc98611ac2f03.zip
import ml_home_prefix
-rw-r--r--fml/lib/FML/Process/Kernel.pm13
-rwxr-xr-xfml/libexec/fmlwrapper13
2 files changed, 16 insertions, 10 deletions
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index 13fc0ef4..92262a52 100644
--- a/fml/lib/FML/Process/Kernel.pm
+++ b/fml/lib/FML/Process/Kernel.pm
@@ -27,11 +27,14 @@ sub new
my $cfargs = {};
# import variables
- if ($args->{ ml_home_dir }) {
- $cfargs->{ ml_home_dir } = $args->{ ml_home_dir };
- }
- else {
- croak "ml_home_dir is not defined.\n";
+ my (@import_vars) = qw(ml_home_dir ml_home_prefix);
+ for my $var (@import_vars) {
+ if ($args->{ $var }) {
+ $cfargs->{ $var } = $args->{ $var };
+ }
+ else {
+ croak "variable $var is not defined.\n";
+ }
}
# import $fml_version
diff --git a/fml/libexec/fmlwrapper b/fml/libexec/fmlwrapper
index 942ac9da..cd8fbcde 100755
--- a/fml/libexec/fmlwrapper
+++ b/fml/libexec/fmlwrapper
@@ -96,11 +96,14 @@ sub Bootstrap
require "$libexec_dir/fml";
ProcessSwitch(
{
- fml_version => $main_cf->{ fml_version },
- cf_list => \@cf,
- myname => $myname,
- ml_home_dir => $ml_home_dir,
- options => \%options,
+ fml_version => $main_cf->{ fml_version },
+
+ myname => $myname,
+ ml_home_prefix => $main_cf->{ ml_home_prefix },
+ ml_home_dir => $ml_home_dir,
+
+ cf_list => \@cf,
+ options => \%options,
});
}
else {