Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28147
Modified Files:
ChangeLog Config.pm
Log Message:
use defaults for options
Index: Config.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- Config.pm 22 Mar 2006 19:50:18 -0000 1.74
+++ Config.pm 27 Mar 2006 05:08:38 -0000 1.75
@@ -203,16 +203,18 @@
=cut
+my %option_defaults = (
+ map( { $_ => 0 } qw(dontask interactive verbosity keep_build keep_root
+ build_as_nobody maintainermode showversion use_binary) ),
+ map ( { $_ => [] } qw(include_trees exclude_trees) ),
+ map( { $_ => -1 } qw(use_binary) ),
+);
+
sub parse_options {
my $class = shift;
my @args = @_;
- my %opts = (
- map( { $_ => 0 } qw(dontask interactive verbosity keep_build
keep_root
- build_as_nobody maintainermode showversion) ),
- map ( { $_ => [] } qw(include_trees exclude_trees) ),
- map( { $_ => -1 } qw(use_binary) ),
- );
+ my %opts = %option_defaults;
my $comlen = 14;
get_options('', [
@@ -819,7 +821,9 @@
sub get_option {
my $option = shift;
- my $default = shift || 0;
+ my $default = shift;
+ $default = $option_defaults{$option} unless defined $default;
+ $default = 0 unless defined $default;
if (exists $options{lc $option}) {
return $options{lc $option};
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1307
retrieving revision 1.1308
diff -u -d -r1.1307 -r1.1308
--- ChangeLog 27 Mar 2006 03:01:46 -0000 1.1307
+++ ChangeLog 27 Mar 2006 05:08:37 -0000 1.1308
@@ -1,3 +1,7 @@
+2006-03-27 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * Config.pm: Use defaults for options.
+
2006-03-26 Dave Vasilevsky <[EMAIL PROTECTED]>
* Engine.pm: Pre-calculate some of %to_be_rebuilt, to fix the case
where:
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
