Commits

Anselm Kruis committed b691720

Update the linux installer and Lib to stackless v2.7.3.

  • Participants
  • Parent commits f9dd406
  • Branches installer-2.7.3

Comments (0)

Files changed (5)

File C2_win32_2.7/slpInstaller/Lib/platform.py

                     release = '7'
                 else:
                     release = '2008ServerR2'
-            elif min == 2:
-                if product_type == VER_NT_WORKSTATION:
-                    release = '8'
-                else:
-                    release = '2012Server'
             else:
-                release = 'post2012Server'
+                release = 'post2008Server'
 
     else:
         if not release:
         case the command should fail.
 
     """
-
-    # We do the import here to avoid a bootstrap issue.
-    # See c73b90b6dadd changeset.
-    #
-    # [..]
-    # ranlib libpython2.7.a
-    # gcc   -o python \
-    #        Modules/python.o \
-    #        libpython2.7.a -lsocket -lnsl -ldl    -lm
-    # Traceback (most recent call last):
-    #  File "./setup.py", line 8, in <module>
-    #    from platform import machine as platform_machine
-    #  File "[..]/build/Lib/platform.py", line 116, in <module>
-    #    import sys,string,os,re,subprocess
-    #  File "[..]/build/Lib/subprocess.py", line 429, in <module>
-    #    import select
-    # ImportError: No module named select
-
-    import subprocess
-
     if sys.platform in ('dos','win32','win16','os2'):
         # XXX Others too ?
         return default
-    target = _follow_symlinks(target)
+    target = _follow_symlinks(target).replace('"', '\\"')
     try:
-        proc = subprocess.Popen(['file', target],
-                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
+        f = os.popen('file "%s" 2> %s' % (target, DEV_NULL))
     except (AttributeError,os.error):
         return default
-    output = proc.communicate()[0]
-    rc = proc.wait()
+    output = string.strip(f.read())
+    rc = f.close()
     if not output or rc:
         return default
     else:

File C4_linux-x86_64_2.7/slpInstaller/Lib/platform.py

                     release = '7'
                 else:
                     release = '2008ServerR2'
-            elif min == 2:
-                if product_type == VER_NT_WORKSTATION:
-                    release = '8'
-                else:
-                    release = '2012Server'
             else:
-                release = 'post2012Server'
+                release = 'post2008Server'
 
     else:
         if not release:
         case the command should fail.
 
     """
-
-    # We do the import here to avoid a bootstrap issue.
-    # See c73b90b6dadd changeset.
-    #
-    # [..]
-    # ranlib libpython2.7.a
-    # gcc   -o python \
-    #        Modules/python.o \
-    #        libpython2.7.a -lsocket -lnsl -ldl    -lm
-    # Traceback (most recent call last):
-    #  File "./setup.py", line 8, in <module>
-    #    from platform import machine as platform_machine
-    #  File "[..]/build/Lib/platform.py", line 116, in <module>
-    #    import sys,string,os,re,subprocess
-    #  File "[..]/build/Lib/subprocess.py", line 429, in <module>
-    #    import select
-    # ImportError: No module named select
-
-    import subprocess
-
     if sys.platform in ('dos','win32','win16','os2'):
         # XXX Others too ?
         return default
-    target = _follow_symlinks(target)
+    target = _follow_symlinks(target).replace('"', '\\"')
     try:
-        proc = subprocess.Popen(['file', target],
-                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
+        f = os.popen('file "%s" 2> %s' % (target, DEV_NULL))
     except (AttributeError,os.error):
         return default
-    output = proc.communicate()[0]
-    rc = proc.wait()
+    output = string.strip(f.read())
+    rc = f.close()
     if not output or rc:
         return default
     else:

File C4_linux-x86_64_2.7/slpInstaller/__init__.py

 
 UCS=4
 PLATFORM="linux-x86_64"
-STACKLESS_VERSION = (2,7,4)
-INSTALLER_VERSION = (0,2)
+STACKLESS_VERSION = (2,7,3)
+INSTALLER_VERSION = (1,)
 
 INSTALLER_VERSION_STR = ".".join(map(str,STACKLESS_VERSION + INSTALLER_VERSION))
 

File C4_linux-x86_64_2.7/slpInstaller/linux-x86_64/lib.stackless/libpython2.7.so.1.0sl

Binary file modified.

File C4_linux-x86_64_2.7/slpInstaller/linux-x86_64/slpython2.7

Binary file modified.