Removed v3.7 to v3.8 3P app installation disk space requirement

Before, the disk space requirement was part of the update itself.
Moved away from that model to install apps separately of the update
to minimise the requirement (divide and conquer).
However, the App Store does not check for disk space before
installing an app so account for this here naively.
Requirements (disk_req) in MB were made with apt on a clean system.

Author: radujipa

debian/changelog

@@ -64,8 +64,13 @@ kano-updater (3.16.2-0) unstable; urgency=low
   * Backport: Added apt HTTPS dependency
   * Backport: Increased the minimum disk requirement buffer to 850MB for dpkg
   * Backport: Added free disk space check before download phase
+  * Backport: Migrate to using mirrored version of Raspbian repo
+  * PreUpdate workaround for installing firmware-ralink over firmware-misc-nonfree
+  * Backport: Configure dpkg to run in noninteractive mode to avoid potential update freezes
+  * Backport: Prioritised update from v3.7 to v3.8 over installation of 3rd 
+    party apps in PostUpdate scenario 
 
- -- Team Kano <dev@kano.me>  Mon, 21 Jan 2019 14:12:00 +0000
+ -- Team Kano <dev@kano.me>  Tue, 12 Feb 2019 15:12:00 +0000
 
 kano-updater (3.16.1-0) unstable; urgency=low
 

kano_updater/disk_requirements.py

@@ -3,14 +3,13 @@
 # Copyright (C) 2018-2019 Kano Computing Ltd.
 # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU GPL v2
 #
-# Variables pertaining to required disk usage for upgrade
+# Required disk usage for upgrade
 
 
 from kano.logging import logger
 
 
 SPACE_BUFFER = 850  # MB
-UPGRADE_3_8_0_SPACE = 1000  # MB
 
 
 def check_disk_space(priority):
@@ -21,18 +20,11 @@ def check_disk_space(priority):
     from kano.utils.disk import get_free_space
 
     from kano_updater.apt_wrapper import AptWrapper
-    from kano_updater.os_version import get_system_version, OSVersion
 
     apt_handle = AptWrapper.get_instance()
     mb_free = get_free_space()
     required_space = apt_handle.get_required_upgrade_space() + SPACE_BUFFER
 
-    # Allowance for installing extra packages in the postupdate scenarios
-    # during the update to 3.8.0
-    system_version = get_system_version()
-    if system_version < OSVersion.from_version_string("Kanux-Beta-3.8.0"):
-        required_space += UPGRADE_3_8_0_SPACE
-
     logger.info('Final upgrade required size is {} MB'.format(required_space))
 
     if mb_free < required_space:

kano_updater/scenarios.py

@@ -7,6 +7,7 @@
 
 import os
 import shutil
+import traceback
 
 from kano.logging import logger
 
@@ -23,6 +24,7 @@
     purge, rclocal_executable, migrate_repository, get_users, run_for_every_user
 from kano_updater.paths import PYLIBS_DIR, PYFALLBACK_DIR, SOURCES_DIR, \
     OS_SOURCES_REFERENCE, REFERENCE_STRETCH_LIST, CMDLINE_TXT_PATH
+from kano_updater.reporting import send_crash_report
 
 
 STRETCH_MIGRATION_LIST = os.path.join(
@@ -908,22 +910,60 @@ def beta_370_to_beta_380(self, dummy_progress):
 
         self._bootconfig_set_value_helper("gpu_mem", "256")
 
-        new_apps = [
-            'adventure',
-            'openttd',
-            'tux-paint',
-            'tux-typing',
-            'libreoffice',
-            'numpty-physics',
-            'gmail',
-            'google-drive',
-            'google-maps',
-            'wikipedia',
-            'whatsapp'
-        ]
-
-        for app in new_apps:
-            run_cmd_log('kano-apps install --no-gui {app}'.format(app=app))
+        try:
+            # Install 3rd party apps from Kano World using the App Store.
+            # Before, the disk space requirement was part of the update itself.
+            # Moved away from that model to install apps separately of the update
+            # to minimise the requirement (divide and conquer).
+            # However, the App Store does not check for disk space before
+            # installing an app so account for this here naively.
+            # Requirements (disk_req) in MB were made with apt on a clean system.
+
+            from kano.utils.disk import get_free_space
+
+            new_apps = [
+                {'kw_app': 'tux-paint', 'disk_req': 413},
+                {'kw_app': 'numpty-physics', 'disk_req': 2},
+                {'kw_app': 'gmail', 'disk_req': 1},
+                {'kw_app': 'google-drive', 'disk_req': 1},
+                {'kw_app': 'google-maps', 'disk_req': 1},
+                {'kw_app': 'wikipedia', 'disk_req': 1},
+                {'kw_app': 'whatsapp', 'disk_req': 1},
+                {'kw_app': 'adventure', 'disk_req': 5},
+                {'kw_app': 'openttd', 'disk_req': 21},
+                {'kw_app': 'tux-typing', 'disk_req': 26},
+                {'kw_app': 'libreoffice', 'disk_req': 385},
+            ]
+
+            run_cmd_log('apt-get autoremove -y')
+
+            for app in new_apps:
+                run_cmd_log('apt-get clean')
+
+                mb_free = get_free_space()
+                mb_required = app['disk_req'] + 250  # MB buffer
+
+                if mb_free > mb_required:
+                    run_cmd_log('kano-apps install --no-gui {app}'.format(app=app['kw_app']))
+                else:
+                    logger.warn(
+                        "Cannot install {app} as it requires {mb_required} but"
+                        " only has {mb_free}"
+                        .format(
+                            app=app['kw_app'],
+                            mb_required=mb_required,
+                            mb_free=mb_free
+                        )
+                    )
+        except Exception as e:
+            logger.error("Failed to install 3rd party apps", exception=e)
+            send_crash_report(
+                "PostUpdate 3.7 to 3.8 app install",
+                "Failed with unexpected exception\n{}"
+                .format(traceback.format_exc())
+            )
+        finally:
+            run_cmd_log('apt-get clean')
 
         # Tell kano-init to put the automatic logins up-to-date
         reconfigure_autostart_policy()