From d77359016f2478937e42a7d206dd131dfc791135 Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Wed, 27 Jan 2021 11:04:19 +1100
Subject: [PATCH 1/3] Use v4.activities.sugarlabs.org
- change from http to https,
- change to new server.
---
src/jarabe/model/update/aslo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jarabe/model/update/aslo.py b/src/jarabe/model/update/aslo.py
index 033039d620..9326bbc4c8 100644
--- a/src/jarabe/model/update/aslo.py
+++ b/src/jarabe/model/update/aslo.py
@@ -66,7 +66,7 @@
_FIND_LINK = './/{http://www.mozilla.org/2004/em-rdf#}updateLink'
_FIND_SIZE = './/{http://www.mozilla.org/2004/em-rdf#}updateSize'
-_UPDATE_PATH = 'http://activities.sugarlabs.org/services/update-aslo.php'
+_UPDATE_PATH = 'https://v4.activities.sugarlabs.org/services/update-aslo.php'
_logger = logging.getLogger('ASLO')
From 795e15e0dae57b59ca2fe97a00d8fd123a924db1 Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Wed, 27 Jan 2021 11:04:46 +1100
Subject: [PATCH 2/3] Drop stable versioning
We are no longer using even numbered releases to indicate source
stability.
---
src/jarabe/model/update/aslo.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/jarabe/model/update/aslo.py b/src/jarabe/model/update/aslo.py
index 9326bbc4c8..6ea361c149 100644
--- a/src/jarabe/model/update/aslo.py
+++ b/src/jarabe/model/update/aslo.py
@@ -82,9 +82,8 @@ def __init__(self):
self._bundle = None
def check(self, bundle):
- # ASLO knows only about stable SP releases
major, minor = config.version.split('.')[0:2]
- sp_version = '%s.%s' % (major, int(minor) + int(minor) % 2)
+ sp_version = '%s.%s' % (major, int(minor) + int(minor))
url = '%s?id=%s&appVersion=%s' % \
(_UPDATE_PATH, bundle.get_bundle_id(), sp_version)
From ec2bbd17793aebb27a71a6a914c303cc3a2d44bb Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Wed, 27 Jan 2021 16:38:43 +1100
Subject: [PATCH 3/3] Review - Drop stable versioning
---
src/jarabe/model/update/aslo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jarabe/model/update/aslo.py b/src/jarabe/model/update/aslo.py
index 6ea361c149..40426483d8 100644
--- a/src/jarabe/model/update/aslo.py
+++ b/src/jarabe/model/update/aslo.py
@@ -83,7 +83,7 @@ def __init__(self):
def check(self, bundle):
major, minor = config.version.split('.')[0:2]
- sp_version = '%s.%s' % (major, int(minor) + int(minor))
+ sp_version = '%s.%s' % (major, minor)
url = '%s?id=%s&appVersion=%s' % \
(_UPDATE_PATH, bundle.get_bundle_id(), sp_version)