[svn-commits] tzafrir: branch 1.4 r3767 - in /branches/1.4: ./ xpp/utils/zconf/Zaptel/Config/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Jan 30 16:53:33 2008
New Revision: 3767

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3767
Log:
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

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/utils/zconf/Zaptel/Config/Defaults.pm

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/xpp/utils/zconf/Zaptel/Config/Defaults.pm
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/utils/zconf/Zaptel/Config/Defaults.pm?view=diff&rev=3767&r1=3766&r2=3767
==============================================================================
--- branches/1.4/xpp/utils/zconf/Zaptel/Config/Defaults.pm (original)
+++ branches/1.4/xpp/utils/zconf/Zaptel/Config/Defaults.pm Wed Jan 30 16:53:33 2008
@@ -46,7 +46,9 @@
 			}
 		}
 	}
-	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);
 }