Changeset 10 for python/trunk/Lib/distutils/command

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

Location:

python/trunk/Lib/distutils/command

Files:

• bdist_rpm.py (modified) (3 diffs)
• install.py (modified) (2 diffs)

python/trunk/Lib/distutils/command/bdist_rpm.py

@@ -200 +200 @@
                   "--python and --fix-python are mutually exclusive options"
 
-        if os.name != 'posix':
+        if os.name != 'posix' and os.name != 'os2':
             raise DistutilsPlatformError, \
                   ("don't know how to create RPM "
@@ -323 +323 @@
         rpm_cmd = ['rpm']
         if os.path.exists('/usr/bin/rpmbuild') or \
+           os.path.exists('/usr/bin/rpmbuild.exe') or \
            os.path.exists('/bin/rpmbuild'):
             rpm_cmd = ['rpmbuild']
@@ -346 +347 @@
         q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
             src_rpm, non_src_rpm, spec_path)
+        if os.name == 'os2':
+            q_cmd = q_cmd.replace( '%{', '%%{')
 
         out = os.popen(q_cmd)

python/trunk/Lib/distutils/command/install.py

@@ -284 +284 @@
 
         # Next, stuff that's wrong (or dubious) only on certain platforms.
-        if os.name != "posix":
+        if os.name != "posix" and os.name != "os2":
             if self.exec_prefix:
                 self.warn("exec-prefix option ignored on this platform")
@@ -299 +299 @@
         self.dump_dirs("pre-finalize_{unix,other}")
 
-        if os.name == 'posix':
+        if os.name == 'posix' or os.name == "os2":
             self.finalize_unix()
         else: