mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Revert r63378. These files need to stay compatible with Python 2.x (until Python 3.0 is actually used to package Python).

Browse source
This commit is contained in:
Martin v. Löwis 2008-07-18 18:40:42 +00:00
parent 5a722409ee
commit 3b6cc09509
6 changed files with 1884 additions and 1879 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Tools/msi/merge.py
View file

@ -19,23 +19,23 @@ def merge(msi, feature, rootdir, modules):
# Step 1: Merge databases, extract cabfiles
m = msilib.MakeMerge2()
m.OpenLog("merge.log")
print("Opened Log")
print "Opened Log"
m.OpenDatabase(msi)
print("Opened DB")
print "Opened DB"
for module in modules:
print(module)
print module
m.OpenModule(module,0)
print("Opened Module",module)
print "Opened Module",module
m.Merge(feature, rootdir)
print("Errors:")
print "Errors:"
for e in m.Errors:
print(e.Type, e.ModuleTable, e.DatabaseTable)
print(" Modkeys:", end=' ')
for s in e.ModuleKeys: print(s, end=' ')
print()
print(" DBKeys:", end=' ')
for s in e.DatabaseKeys: print(s, end=' ')
print()
print e.Type, e.ModuleTable, e.DatabaseTable
print " Modkeys:",
for s in e.ModuleKeys: print s,
print
print " DBKeys:",
for s in e.DatabaseKeys: print s,
print
cabname = tempfile.mktemp(suffix=".cab")
m.ExtractCAB(cabname)
cab_and_filecount.append((cabname, len(m.ModuleFiles)))
@ -56,7 +56,7 @@ def merge(msi, feature, rootdir, modules):
seq = r.IntegerData(1)
if seq > maxmedia:
maxmedia = seq
print("Start of Media", maxmedia)
print "Start of Media", maxmedia
for cabname, count in cab_and_filecount:
stream = "merged%d" % maxmedia