Changeset 393 for python/trunk

Timestamp:

Mar 21, 2014, 1:31:06 PM (12 years ago)

Author:

dmik

Message:

python: Fix merge typos.

Location:

python/trunk

Files:

• Lib/site.py (modified) (1 diff)
• setup.py (modified) (1 diff)

python/trunk/Lib/site.py

@@ -289 +289 @@
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
         elif sys.platform == 'os2knix':
-            sitedirs.append(os.path.join(prefix, "lib",
+            sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
                                         "site-packages"))
-            sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
+            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
         elif os.sep == '/':
             sitepackages.append(os.path.join(prefix, "lib",

python/trunk/setup.py

@@ -526 +526 @@
 
         # Check for OS/2 which may have libraries in non-standard locations
-        if platform == 'os2knix':
+        if host_platform == 'os2knix':
             lib_dirs += ['/@unixroot/usr/lib']
             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)