Changeset 50

Show
Ignore:
Timestamp:
Tue Sep 13 19:34:10 2005
Author:
giovannibajo
Message:

Avoid including the same binary extension twice

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/Build.py

    r46 r50  
    381 381                     inm = inm + binext  
    382 382             toc.append((inm, fnm, typ))  
      383         seen = {}  
    383 384         for inm, fnm, typ in toc:  
    384 385             if typ in ('BINARY', 'EXTENSION'):  
    …… 
    389 390                                      self.upx_binaries and ( iswin or cygwin )  
    390 391                                       and config['hasUPX'])  
      392                     # Avoid importing the same binary extension twice. This might  
      393                     # happen if they come from different sources (eg. once from  
      394                     # binary dependence, and once from direct import).  
      395                     if typ == 'BINARY' and seen.has_key(fnm):  
      396                         continue  
      397                     seen[fnm] = 1  
    391 398                     mytoc.append((inm, fnm, self.cdict.get(typ,0),  
    392 399                                   self.xformdict.get(typ,'b')))