Changeset 20902

Timestamp:

10/07/08 18:09:05 (2 months ago)

Author:

yappo

Message:

--init の時は select しない

Files:

• lang/perl/Module-Setup/trunk/lib/Module/Setup.pm (modified) (2 diffs)

lang/perl/Module-Setup/trunk/lib/Module/Setup.pm

@@ -57 +57 @@
     }
 
-    $options->{flavor}       ||= $self->select_flavor;
-    $options->{flavor_class} ||= 'Default';
-
     no warnings 'redefine';
     local *has_term = $self->set_has_term_sub if $set_has_term; ## no critic
@@ -65 +62 @@
     my @argv = defined $argv && ref($argv) eq 'ARRAY' ? @{ $argv } : @ARGV;
 
+    $options->{flavor_class} ||= 'Default';
+
     # create flavor
     if ($options->{init}) {
-        $options->{flavor} = shift @argv if @argv;
+        $options->{flavor}   = shift @argv if @argv;
+        $options->{flavor} ||= 'default';
         return $self->create_flavor($options);
     }