sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add skip-install-mime option to bundlebuilder

Browse Source 
Historically, distro packagers have been using bunblebuilder, via
"setup.py install", to populate packages directories and files.

The install procedure uses ActivityBundle.install_mime_type to install
custom mime types, by creating symlinks and updating the system mime
types database via the update-mime-database tool.

When ActivityBundle.install_mime_type is executed during packages
creation, the symlinks end-up broken in the final package and the use
of update-mime-database populates the final packages with a new copy
of the database files which could clash with the system copy.

This patch adds a new option, called --skip-install-mime to "setup.py
install" to skip the execution of ActivityBundle.install_mime_type and
avoid the issues mentioned above.

Activity packagers should use this new option. The creation of symlinks
and the execution of update-mime-database should be done in post install
packaging steps.

Signed-off-by: Martin Abente Lahaye <tch@sugarlabs.org>
This commit is contained in:
Martin Abente Lahaye 2015-05-28 15:23:48 -04:00
parent fc4d629b50
commit e8553c13a1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sugar3/activity/bundlebuilder.py
View File

@ -253,7 +253,7 @@ class Installer(Packager):
Packager.__init__(self, builder.config) Packager.__init__(self, builder.config)
self.builder = builder self.builder = builder
def install(self, prefix): def install(self, prefix, install_mime=True):
self.builder.build() self.builder.build()
activity_path = os.path.join(prefix, 'share', 'sugar', 'activities', activity_path = os.path.join(prefix, 'share', 'sugar', 'activities',
@ -285,6 +285,7 @@ class Installer(Packager):
shutil.copy(source, dest) shutil.copy(source, dest)
if install_mime:
self.config.bundle.install_mime_type(self.config.source_dir) self.config.bundle.install_mime_type(self.config.source_dir)
@ -373,7 +374,7 @@ def cmd_install(config, options):
"""Install the activity in the system""" """Install the activity in the system"""
installer = Installer(Builder(config)) installer = Installer(Builder(config))
installer.install(options.prefix) installer.install(options.prefix, options.install_mime)
def cmd_genpot(config, options): def cmd_genpot(config, options):
@ -437,6 +438,10 @@ def start():
install_parser.add_argument( install_parser.add_argument(
"--prefix", dest="prefix", default=sys.prefix, "--prefix", dest="prefix", default=sys.prefix,
help="Path for installing") help="Path for installing")
install_parser.add_argument(
"--skip-install-mime", dest="install_mime",
action="store_false", default=True,
help="Skip the installation of custom mime types in the system")
check_parser = subparsers.add_parser( check_parser = subparsers.add_parser(
"check", help="Run tests for the activity") "check", help="Run tests for the activity")