[Pkg-sugar-commit] [sugar-toolkit] 01/07: bundlebuilder: move the mime type installation in a separate method, part of #10427

Jonas Smedegaard dr at jones.dk
Thu Apr 16 18:50:17 UTC 2015


This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.84.16-1
in repository sugar-toolkit.

commit 75c2d1dd8b2ee5ee70957e19fa4ff314479da29b
Author: Simon Schampijer <simon at schampijer.de>
Date:   Wed Dec 15 11:46:56 2010 +0100

    bundlebuilder: move the mime type installation in a separate method, part of #10427
    
    missing part of: 434cd22fa205519c912127209b55c64e07092025
    
    (hint by fcrozat, on master the patch is d7e0e22f4979a0e4baf2d3124833e65f5184f4de)
---
 src/sugar/bundle/activitybundle.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index c39c519..a073c7a 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
@@ -317,6 +317,13 @@ class ActivityBundle(Bundle):
             else:
                 logging.warning(err)
 
+        self.install_mime_type(install_path)
+
+        return install_path
+
+    def install_mime_type(self, install_path):
+        ''' Update the mime type database and install the mime type icon
+        '''
         xdg_data_home = os.getenv('XDG_DATA_HOME',
                                   os.path.expanduser('~/.local/share'))
 
@@ -351,8 +358,6 @@ class ActivityBundle(Bundle):
                               os.path.join(installed_icons_dir,
                                            os.path.basename(info_file)))
 
-        return install_path
-
     def _symlink(self, src, dst):
         if not os.path.isfile(src):
             return

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git



More information about the pkg-sugar-commit mailing list