Changeset 303

Show
Ignore:
Timestamp:
Tue Jan 23 11:10:45 2007
Author:
giovannibajo
Message:

Fix the annoying bug about MSVCRT71.DLL being extracted twice.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/Build.py

    r288 r303  
    698 698     def append(self, tpl):  
    699 699         try:  
    700               if not self.fltr.get(tpl[0]):  
      700             fn = tpl[0]  
      701             if tpl[2] == "BINARY":  
      702                 # Normalize the case for binary files only (to avoid duplicates  
      703                 # for different cases under Windows). We can't do that for  
      704                 # Python files because the import semantic (even at runtime)  
      705                 # depends on the case.  
      706                 fn = os.path.normcase(fn)  
      707             if not self.fltr.get(fn):  
    701 708                 self.data.append(tpl)  
    702                   self.fltr[tpl[0]] = 1  
      709                 self.fltr[fn] = 1  
    702 709         except TypeError:  
    703 710             print "TOC found a %s, not a tuple" % tpl  
    704 711             raise  
    705 712     def insert(self, pos, tpl):  
    706           if not self.fltr.get(tpl[0]):  
      713         fn = tpl[0]  
      714         if tpl[2] == "BINARY":  
      715             fn = os.path.normcase(fn)  
      716         if not self.fltr.get(fn):  
    707 717             self.data.insert(pos, tpl)  
    708               self.fltr[tpl[0]] = 1  
      718             self.fltr[fn] = 1  
    708 718     def __add__(self, other):  
    709 719         rslt = TOC(self.data)  

  • trunk/doc/CHANGES.txt

    r302 r303  
    4 4 -----------------------------  
    5 5  + Add import hooks for PyQt4 (thanks to Pascal Veret)  
      6  + Add fix for the very annoying "MSVCRT71 could not be extracted" bug,  
      7    which was caused by the DLL being packaged twice (thanks to Idris  
      8    Aykun).  
    6 9  
    7 10