Simplify / optimize reading version of yunohost packages...

debian/control

@@ -13,7 +13,7 @@ Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
  , moulinette (>= 3.7), ssowat (>= 3.7)
  , python-psutil, python-requests, python-dnspython, python-openssl
- , python-apt, python-miniupnpc, python-dbus, python-jinja2
+ , python-miniupnpc, python-dbus, python-jinja2
  , python-toml
  , apt, apt-transport-https
  , nginx, nginx-extras (>=1.6.2)

src/yunohost/data_migrations/0003_migrate_to_stretch.py

@@ -14,7 +14,7 @@ from yunohost.service import _run_service_command
 from yunohost.regenconf import (manually_modified_files,
                                 manually_modified_files_compared_to_debian_default)
 from yunohost.utils.filesystem import free_space_in_directory
-from yunohost.utils.packages import get_installed_version
+from yunohost.utils.packages import get_ynh_package_version
 from yunohost.utils.network import get_network_interfaces
 from yunohost.firewall import firewall_allow, firewall_disallow
 
@@ -94,7 +94,7 @@ class MyMigration(Migration):
         return int(check_output("grep VERSION_ID /etc/os-release | head -n 1 | tr '\"' ' ' | cut -d ' ' -f2"))
 
     def yunohost_major_version(self):
-        return int(get_installed_version("yunohost").split('.')[0])
+        return int(get_ynh_package_version("yunohost")["version"].split('.')[0])
 
     def check_assertions(self):
 

src/yunohost/utils/packages.py

@@ -21,15 +21,12 @@
 import re
 import os
 import logging
-from collections import OrderedDict
 
-import apt
+from moulinette.utils.process import check_output
-from apt_pkg import version_compare
-
-from moulinette import m18n
 
 logger = logging.getLogger('yunohost.utils.packages')
 
+YUNOHOST_PACKAGES = ['yunohost', 'yunohost-admin', 'moulinette', 'ssowat']
 
 # Exceptions -----------------------------------------------------------------
 
@@ -368,66 +365,29 @@ class SpecifierSet(object):
 
 # Packages and cache helpers -------------------------------------------------
 
-def get_installed_version(*pkgnames, **kwargs):
+def get_ynh_package_version(package):
-    """Get the installed version of package(s)
 
-    Retrieve one or more packages named `pkgnames` and return their installed
+    # Returns the installed version and release version ('stable' or 'testing'
-    version as a dict or as a string if only one is requested.
+    # or 'unstable')
 
-    """
+    # NB: this is designed for yunohost packages only !
-    versions = OrderedDict()
+    # Not tested for any arbitrary packages that
-    cache = apt.Cache()
+    # may handle changelog differently !
-
-    # Retrieve options
-    with_repo = kwargs.get('with_repo', False)
-
-    for pkgname in pkgnames:
-        try:
-            pkg = cache[pkgname]
-        except KeyError:
-            logger.warning(m18n.n('package_unknown', pkgname=pkgname))
-            if with_repo:
-                versions[pkgname] = {
-                    "version": None,
-                    "repo": None,
-                }
-            else:
-                versions[pkgname] = None
-            continue
-
-        try:
-            version = pkg.installed.version
-        except AttributeError:
-            version = None
-
-        try:
-            # stable, testing, unstable
-            repo = pkg.installed.origins[0].component
-        except AttributeError:
-            repo = ""
-
-        if repo == "now":
-            repo = "local"
-
-        if with_repo:
-            versions[pkgname] = {
-                "version": version,
-                # when we don't have component it's because it's from a local
-                # install or from an image (like in vagrant)
-                "repo": repo if repo else "local",
-            }
-        else:
-            versions[pkgname] = version
-
-    if len(pkgnames) == 1:
-        return versions[pkgnames[0]]
-    return versions
 
+    changelog = "/usr/share/doc/%s/changelog.gz" % package
+    cmd = "gzip -cd %s | head -n1" % changelog
+    if not os.path.exists(changelog):
+        return {"version": "?", "repo": "?"}
+    out = check_output(cmd).split()
+    # Output looks like : "yunohost (1.2.3) testing; urgency=medium"
+    return {"version": out[1].strip("()"),
+            "repo": out[2].strip(";")}
 
 def meets_version_specifier(pkgname, specifier):
     """Check if a package installed version meets specifier"""
-    spec = SpecifierSet(specifier)
+    # In practice, this function is only used to check the yunohost version installed
-    return get_installed_version(pkgname) in spec
+    assert pkgname in YUNOHOST_PACKAGES
+    return get_ynh_package_version(pkgname) in SpecifierSet(specifier)
 
 
 # YunoHost related methods ---------------------------------------------------
@@ -437,10 +397,11 @@ def ynh_packages_version(*args, **kwargs):
     # (Namespace(_callbacks=deque([]), _tid='_global', _to_return={}), []) {}
     # they don't seem to serve any purpose
     """Return the version of each YunoHost package"""
-    return get_installed_version(
+    from collections import OrderedDict
-        'yunohost', 'yunohost-admin', 'moulinette', 'ssowat',
+    packages = OrderedDict()
-        with_repo=True
+    for package in YUNOHOST_PACKAGES:
-    )
+        packages[package] = get_ynh_package_version(package)
+    return packages
 
 
 def dpkg_is_broken():
@@ -457,8 +418,6 @@ def dpkg_lock_available():
 
 def _list_upgradable_apt_packages():
 
-    from moulinette.utils.process import check_output
-
     # List upgradable packages
     # LC_ALL=C is here to make sure the results are in english
     upgradable_raw = check_output("LC_ALL=C apt list --upgradable")