Ticket #140: 0006-Don-t-trump-versioned-module-dependencies-with-unver.patch

File 0006-Don-t-trump-versioned-module-dependencies-with-unver.patch, 1.1 kB (added by scop, 2 years ago)
  • a/scripts/perl.req

    old new  
    244244 
    245245      # use base qw(Foo) dependencies 
    246246      if ($statement eq "use" && $module eq "base") { 
    247         $require{$module} = undef; 
     247        $require{$module} ||= undef; 
    248248        if ($version =~ /^qw\s*[(\/]\s*([^)\/]+?)\s*[)\/]/) { 
    249           $require{$_} = undef for split(' ', $1); 
     249          $require{$_} ||= undef for split(' ', $1); 
    250250        } 
    251251        elsif ($version =~ /(["'])([^"']+)\1/) { 
    252           $require{$2} = undef; 
     252          $require{$2} ||= undef; 
    253253        } 
    254254        next; 
    255255      } 
    256256      $version = undef unless $version =~ /^$modver_re$/o; 
    257257 
    258       $require{$module} = $version; 
     258      $require{$module} ||= $version; 
    259259    } 
    260260 
    261261  }