Second Life viewer sources 1.22.0-RC

1 files changed, 48 insertions, 2 deletions

diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index 0cc2fad..3e8f9bb 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -37,6 +37,7 @@ import copy
 import md5
 import optparse
 import os
+import platform
 import pprint
 import shutil
 import sys
@@ -308,6 +309,13 @@ class Installer(object):
         "Return a list of installed packages."
         return self._installed.keys()
 
+    def detail_installed(self, name):
+        "Return file list for specific installed package."
+        filelist = []
+        for url in self._installed[name]._installed.keys():
+            filelist.extend(self._installed[name].files_in(url))
+        return filelist
+
     def _update_field(self, description, field, value, multiline=False):
         """Given a block and a field name, add or update it.
         @param description a dict containing all the details of a description.
@@ -458,7 +466,12 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
             if not self._dryrun:
                 if os.path.exists(filename):
                     remove_dir_set.add(os.path.dirname(filename))
-                    os.remove(filename)
+                    try:
+                        os.remove(filename)
+                    except OSError:
+                        # This is just for cleanup, so we don't care
+                        # about normal failures.
+                        pass
         for dirname in remove_dir_set:
             try:
                 os.removedirs(dirname)
@@ -730,7 +743,23 @@ def _get_platform():
         'cygwin' : 'windows',
         'solaris' : 'solaris'
         }
-    return platform_map[sys.platform]
+    this_platform = platform_map[sys.platform]
+    if this_platform == 'linux':
+        if platform.architecture()[0] == '64bit':
+            # TODO -- someday when install.py accepts a platform of the form 
+            # os/arch/compiler/compiler_version then we can replace the 
+            # 'linux64' platform with 'linux/x86_64/gcc/4.1'
+            this_platform = 'linux64'
+        else:
+            gcc_version = os.popen("g++ -dumpversion", 'r').read()[:-3]
+            if gcc_version == '4.1':
+                # the 'linux32' platform is a HACK until we can figure
+                # out how to make the install.py script accept a platform of
+                # the form os/arch/compiler/compiler_version for the download
+                # and extract stage
+                #this_platform = 'linux/i686/gcc/4.1'
+                this_platform = 'linux32'
+    return this_platform
 
 def _getuser():
     "Get the user"
@@ -971,6 +1000,12 @@ Ignored if --add-installable or --add-installable-package is not specified.""")
         dest='detail_installable',
         help="Get detailed information on specified installable and exit.")
     parser.add_option(
+        '--detail-installed', 
+        type='string',
+        default=None,
+        dest='detail_installed',
+        help="Get list of files for specified installed installable and exit.")
+    parser.add_option(
         '--uninstall', 
         action='store_true',
         default=False,
@@ -1012,6 +1047,17 @@ def main():
             print "Installable '"+options.detail_installable+"' not found in",
             print "install file."
         return 0
+    if options.detail_installed:
+        try:
+            detail = installer.detail_installed(options.detail_installed)
+            #print "Detail on installed",options.detail_installed+":"
+            for line in detail:
+                print line
+        except:
+            raise
+            print "Installable '"+options.detail_installed+"' not found in ",
+            print "install file."
+        return 0
     if options.list_licenses:
         print "license list:", installer.list_licenses()
         return 0