Merge lp:~3v1n0/unity/migrate-to-sc-favorite into lp:unity

[Marco Trevisan (Treviño)]

unity.migrations: add 04_unity_update_software_center_desktop_file

Update favorite to use gnome software

[Robert Ancell (robert-ancell)]

The tools/migration-scripts/02_unity_setup_text_scale_factor changes really should be a separate commit.

Please split:

favorites = [i.replace('ubuntu-software-center', 'org.gnome.Software') if 'ubuntu-software-center.desktop' in i else i for i in favorites]

into multiple lines. It's really hard to understand.

Otherwise, it seems to do the right thing - migrate users from u-s-c to g-s.

[Robert Ancell (robert-ancell)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4069
http://jenkins.qa.ubuntu.com/job/unity-ci/1414/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/64/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1414/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/unity.migrations'
--- debian/unity.migrations	2014-08-26 23:17:51 +0000
+++ debian/unity.migrations	2016-02-22 20:51:17 +0000
@@ -1,3 +1,4 @@
 tools/migration-scripts/01_unity_change_dconf_path
 tools/migration-scripts/02_unity_setup_text_scale_factor
 tools/migration-scripts/03_unity_first_run_stamp_move
+tools/migration-scripts/04_unity_update_software_center_desktop_file

=== modified file 'tools/migration-scripts/02_unity_setup_text_scale_factor'
--- tools/migration-scripts/02_unity_setup_text_scale_factor	2015-04-06 13:37:54 +0000
+++ tools/migration-scripts/02_unity_setup_text_scale_factor	2016-02-22 20:51:17 +0000
@@ -28,11 +28,12 @@
 UNITY_UI_SETTINGS_PATH = "/com/canonical/unity/interface/"
 UNITY_TEXT_SCALE_FACTOR = "text-scale-factor";
 
-if GNOME_UI_SETTINGS not in Gio.Settings.list_schemas():
+gnome_ui_schema = Gio.SettingsSchemaSource.get_default().lookup(GNOME_UI_SETTINGS, recursive=False)
+if not gnome_ui_schema:
     print("No gnome desktop interface schemas found, no migration needed")
     sys.exit(0)
 
-text_scale_factor = Gio.Settings(schema=GNOME_UI_SETTINGS).get_double(GNOME_TEXT_SCALE_FACTOR)
+text_scale_factor = Gio.Settings(settings_schema=gnome_ui_schema).get_double(GNOME_TEXT_SCALE_FACTOR)
 
 # gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
 # Gio.Settings(schema=UNITY_UI_SETTINGS).set_int(UNITY_TEXT_SCALE_FACTOR, text_scale_factor)

=== added file 'tools/migration-scripts/04_unity_update_software_center_desktop_file'
--- tools/migration-scripts/04_unity_update_software_center_desktop_file	1970-01-01 00:00:00 +0000
+++ tools/migration-scripts/04_unity_update_software_center_desktop_file	2016-02-22 20:51:17 +0000
@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+# Copyright (C) 2016 Canonical
+#
+# Authors:
+#  Marco Trevisan <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUTa
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gi.repository import Gio
+
+UNITY_LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher";
+UNITY_LAUNCHER_SETTINGS_PATH = "/com/canonical/unity/launcher/"
+UNITY_LAUNCER_FAVORITES = "favorites";
+
+favorites = Gio.Settings(schema=UNITY_LAUNCHER_SETTINGS).get_strv(UNITY_LAUNCER_FAVORITES)
+
+for i in range(len(favorites)):
+  if 'ubuntu-software-center.desktop' in favorites[i]:
+    favorites[i] = favorites[i].replace('ubuntu-software-center', 'org.gnome.Software')
+
+# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
+from subprocess import Popen, PIPE, STDOUT
+p = Popen(("dconf load "+UNITY_LAUNCHER_SETTINGS_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+p.communicate(input=bytes("[/]\n"+UNITY_LAUNCER_FAVORITES+"={}".format(favorites), 'utf-8'))