summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-01-30 22:42:55 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-01-30 22:42:55 +0000
commit8d6725e6d60c7cb55d580463fd2e20335f39e2f5 (patch)
treef0b07559fad3cc5e98b03fcd3a58566f03ae08a9
parent7dc9b88fd9a781426b6cac247114e5792903a23b (diff)
Don't fail zapconf if no config file was found.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3766 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--xpp/utils/zconf/Zaptel/Config/Defaults.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/xpp/utils/zconf/Zaptel/Config/Defaults.pm b/xpp/utils/zconf/Zaptel/Config/Defaults.pm
index 1d11403..360ca0a 100644
--- a/xpp/utils/zconf/Zaptel/Config/Defaults.pm
+++ b/xpp/utils/zconf/Zaptel/Config/Defaults.pm
@@ -46,7 +46,9 @@ sub source_vars {
}
}
}
- die "No default_file" unless $default_file;
+ if (! $default_file) {
+ return ("", ());
+ }
my %vars = Zaptel::Config::Defaults::do_source($default_file, @vars);
return ($default_file, %vars);
}