diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-30 22:53:33 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-30 22:53:33 +0000 |
| commit | 7fa6572b797c2913e016d3c3098fb57c1acd648b (patch) | |
| tree | 1c18ad257aa51dc1e61b7b76cb39b0b7399d9235 | |
| parent | 0a345c3b315391a73ef7ec7e73deb87c597f450e (diff) | |
Don't fail zapconf if no config file was found.
Merged revisions 3766 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3767 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Config/Defaults.pm | 4 |
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); } |