[Bps-public-commit] r14374 - in Shipwright/trunk: lib/Shipwright/Source

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Tue Jul 22 09:17:02 2008
New Revision: 14374

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Source/Base.pm

Log:
 r14831 at sunnavys-mb:  sunnavy | 2008-07-22 21:15:11 +0800
 don't keep skipped modules in scripts/foo/require.yml, since it will harm update cmd


Modified: Shipwright/trunk/lib/Shipwright/Source/Base.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Source/Base.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Source/Base.pm	Tue Jul 22 09:17:02 2008
@@ -186,9 +186,15 @@
                 }
 
                 my $name = $module;
+
                 if ( $self->_is_skipped($module) ) {
-                    delete $require->{$type}{$module}
-                      unless defined $map->{$module};
+                    unless ( defined $map->{$module} ) {
+
+                # not in the map, meaning it's not been imported before,
+                # so it's safe to erase it
+                        delete $require->{$type}{$module};
+                        next;
+                    }
                 }
                 else {