Changeset 43938 in vbox

Timestamp:

Nov 22, 2012 1:50:07 PM (12 years ago)

Author:

vboxsync

Message:

Installer/Solaris: check if a particular python install is usable, otherwise skip over it and hope that the user won't use exactly this one

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (8 diffs)

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -5 +5 @@
 # VirtualBox Configuration Script, Solaris host.
 #
-# Copyright (C) 2009-2010 Oracle Corporation
+# Copyright (C) 2009-2012 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41 +41 @@
 BIN_SVCADM=/usr/sbin/svcadm
 BIN_SVCCFG=/usr/sbin/svccfg
-BIN_SVCS=/usr/bin/svcs 
+BIN_SVCS=/usr/bin/svcs
 BIN_IFCONFIG=/sbin/ifconfig
 BIN_SVCS=/usr/bin/svcs
@@ -775 +775 @@
     pythondesc=$2
     if test -x "$pythonbin"; then
+        # check if python has working distutils
+        $pythonbin -c "from distutils.core import setup" > /dev/null 2>&1
+        if test "$?" -ne 0; then
+            subprint "Skipped: $pythondesc install is unusable"
+            return 0
+        fi
+
         VBOX_INSTALL_PATH="$DIR_VBOXBASE"
         export VBOX_INSTALL_PATH
@@ -1042 +1049 @@
 
                         if test $recreatelink -eq 1; then
-                            # Check after removing our settings if /etc/netmasks is identifcal to /etc/inet/netmasks 
+                            # Check after removing our settings if /etc/netmasks is identifcal to /etc/inet/netmasks
                             anydiff=`diff $nmaskbackupfile "$PKG_INSTALL_ROOT/etc/inet/netmasks"`
                             if test ! -z "$anydiff"; then
@@ -1048 +1055 @@
                                 recreatelink=2
                             fi
-                        fi                        
+                        fi
 
                         echo "#VirtualBox_SectionStart" >> $nmaskbackupfile
@@ -1124 +1131 @@
                     fi
                     PYTHONBIN=`which python2.5 2>/dev/null`
-                    install_python_bindings "$PYTHONBIN"  "Python 2.5"
+                    install_python_bindings "$PYTHONBIN" "Python 2.5"
                     if test "$?" -eq 0; then
                         INSTALLEDIT=0
@@ -1150 +1157 @@
 
         update_boot_archive
-    
+
         return 0
     else
@@ -1164 +1171 @@
 {
     fatal=$1
-    
+
     cleanup_install "$fatal"