[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.410,1.411

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19009/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Fix a bug in setting new features

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- Base.pm	12 Apr 2005 03:43:10 -0000	1.410
+++ Base.pm	12 Apr 2005 18:57:47 -0000	1.411
@@ -319,18 +319,19 @@
     if ($ph->{features}->exists($key)) { return $ph->{features}->access($key, @_) }
 
     if (my $info = $ph->{auto_features}->access($key)) {
-      warn "Checking auto_feature '$key'";
       return not $self->prereq_failures($info);
     }
-    return;
+    return $ph->{features}->access($key, @_);
   }
   
-  # No args - get the regular features & add the auto_features
-  my %features = $ph->{features}->access();
+  # No args - get the auto_features & overlay the regular features
+  my %features;
   my %auto_features = $ph->{auto_features}->access();
   while (my ($name, $info) = each %auto_features) {
     $features{$name} = not $self->prereq_failures($info);
   }
+  %features = (%features, $ph->{features}->access());
+
   return wantarray ? %features : \%features;
 }
 BEGIN { *feature = \&features }