[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51419] trunk/blender/release/scripts/ startup/bl_operators/wm.py: simplify addon install print, Now it only prints the source and destination dirs, with a list of addons added.

[Campbell Barton]

Revision: 51419
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51419
Author:   campbellbarton
Date:     2012-10-19 10:37:24 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
simplify addon install print, Now it only prints the source and destination dirs, with a list of addons added.
don't think its needed to print the full path of each addon.

also remove the __MACOX check, its harmless and people can make sure there zips dont have cruft in them before distributing them.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/wm.py

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-10-19 08:51:31 UTC (rev 51418)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-10-19 10:37:24 UTC (rev 51419)
@@ -1755,7 +1755,6 @@
 
         #check to see if the file is in compressed format (.zip)
         if zipfile.is_zipfile(pyfile):
-            is_archive = True
             try:
                 file_to_extract = zipfile.ZipFile(pyfile, 'r')
             except:
@@ -1774,18 +1773,11 @@
 
             try:  # extract the file to "addons"
                 file_to_extract.extractall(path_addons)
-
-                # zip files can create this dir with metadata, don't need it
-                macosx_dir = os.path.join(path_addons, '__MACOSX')
-                if os.path.isdir(macosx_dir):
-                    shutil.rmtree(macosx_dir)
-
             except:
                 traceback.print_exc()
                 return {'CANCELLED'}
 
         else:
-            is_archive = False
             path_dest = os.path.join(path_addons, os.path.basename(pyfile))
 
             if self.overwrite:
@@ -1825,19 +1817,9 @@
         bpy.utils.refresh_script_paths()
 
         # print message
-        msg = "Modules Installed from %r:" % (pyfile)
+        msg = "Modules Installed from %r into %r (%s)" % (pyfile, path_addons, ", ".join(sorted(addons_new)))
         print(msg)
         self.report({'INFO'}, msg)
-        for mod in addon_utils.modules(addon_utils.addons_fake_modules):
-            if mod.__name__ in addons_new:
-                info = addon_utils.module_bl_info(mod)
-                if is_archive:
-                    module_path = os.path.dirname(os.path.abspath(mod.__file__))
-                else:
-                    module_path = os.path.abspath(mod.__file__)
-                msg = "\"%s\" installed in %r" % (info["name"],module_path)
-                self.report({'INFO'}, msg)
-                print(msg)
 
         return {'FINISHED'}