From: Michael W. Hudson <mwh@python.net>
Date: Tue, 19 Feb 2002 14:15:40 +0000 (+0000)
Subject: Backport theller's checkin of revision 1.35:
X-Git-Tag: v2.2.1c1~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82d3c7da8b7ccb68b7bd93bd91bc5785a06e19c8;p=thirdparty%2FPython%2Fcpython.git

Backport theller's checkin of revision 1.35:

package_dir must be converted from the distutils path conventions to
local conventions before being used by build_py.

Fixes SF bug #509288, probably a candidate for 2.2.1
---

diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index 527e81d9ae48..97d094b1b29e 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -12,6 +12,7 @@ from glob import glob
 
 from distutils.core import Command
 from distutils.errors import *
+from distutils.util import convert_path
 
 
 class build_py (Command):
@@ -50,7 +51,10 @@ class build_py (Command):
         # options -- list of packages and list of modules.
         self.packages = self.distribution.packages
         self.py_modules = self.distribution.py_modules
-        self.package_dir = self.distribution.package_dir
+        self.package_dir = {}
+        if self.distribution.package_dir:
+            for name, path in self.distribution.package_dir.items():
+                self.package_dir[name] = convert_path(path)
 
         # Ick, copied straight from install_lib.py (fancy_getopt needs a
         # type system!  Hell, *everything* needs a type system!!!)