diff options
Diffstat (limited to 'rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch')
| -rw-r--r-- | rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch b/rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch new file mode 100644 index 0000000..db0deff --- /dev/null +++ b/rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch @@ -0,0 +1,46 @@ +From patchwork Wed Jan 19 16:44:51 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [sugar] Pass sugar version to micro-format.php ASLO call +Date: Wed, 19 Jan 2011 21:44:51 -0000 +From: Aleksey Lim <alsroot@member.fsf.org> +X-Patchwork-Id: 595 +Message-Id: <1295455491-8296-1-git-send-email-alsroot@member.fsf.org> +To: dextrose@lists.sugarlabs.org + +--- + .../cpsection/updater/backends/microformat.py | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + + +diff --git a/extensions/cpsection/updater/backends/microformat.py b/extensions/cpsection/updater/backends/microformat.py +index 97499aa..6abc185 100644 +--- a/extensions/cpsection/updater/backends/microformat.py ++++ b/extensions/cpsection/updater/backends/microformat.py +@@ -27,8 +27,6 @@ import gconf + + from jarabe import config + +-client = gconf.client_get_default() +-_UPDATE_PATH = client.get_string('/desktop/sugar/updater_url') + _ACTIVITIES_LIST = {} + ACTION_CHECKING = 0 + ACTION_UPDATING = 1 +@@ -167,7 +165,15 @@ class _UpdateFetcher(gobject.GObject): + def download_bundle_updates(self): + self.emit('progress', ACTION_CHECKING, 'Fetching update ' + 'information', 1, 3) +- self._url = _UPDATE_PATH ++ ++ client = gconf.client_get_default() ++ self._url = client.get_string('/desktop/sugar/updater_url') ++ if '?' in self._url: ++ self._url += '&' ++ else: ++ self._url += '?' ++ self._url += 'sugar=' + '.'.join(config.version.split('.')[0:2]) ++ + self._file = gio.File(self._url) + logging.debug('Fetch %s', self._url) + self._file.read_async(self.__read_async_cb) |