From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 12 Jun 2008 20:07:53 +0000 (+0000)
Subject: Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license.
X-Git-Tag: v2.6b1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8a18eaca9e2bdb278a8e45d1cb24e14198d0959;p=python

Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license.
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d152f75be9..2fc55e8853 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -848,17 +848,18 @@ def generate_license():
     import shutil, glob
     out = open("LICENSE.txt", "w")
     shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out)
-    for dir, file in (("bzip2","LICENSE"),
-                      ("db", "LICENSE"),
-                      ("openssl", "LICENSE"),
-                      ("tcl", "license.terms"),
-                      ("tk", "license.terms")):
-        out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % dir)
-        dirs = glob.glob(srcdir+"/../"+dir+"-*")
+    for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
+                      ("Berkeley DB", "db-*", "LICENSE"),
+                      ("openssl", "openssl-*", "LICENSE"),
+                      ("Tcl", "tcl8*", "license.terms"),
+                      ("Tk", "tk8*", "license.terms"),
+                      ("Tix", "tix-*", "license.terms")):
+        out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % name)
+        dirs = glob.glob(srcdir+"/../"+pat)
         if not dirs:
-            raise ValueError, "Could not find "+srcdir+"/../"+dir+"-*"
+            raise ValueError, "Could not find "+srcdir+"/../"+pat
         if len(dirs) > 2:
-            raise ValueError, "Multiple copies of "+dir
+            raise ValueError, "Multiple copies of "+pat
         dir = dirs[0]
         shutil.copyfileobj(open(os.path.join(dir, file)), out)
     out.close()