Merge ~sylvain-pineau/checkbox-core-snap:fix-distro-traceback into checkbox-core-snap:master

[Sylvain Pineau]

A fix for the following error on Jammy:

+ /usr/bin/python3 -m pip install -U meson
ERROR: Exception:
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/pip/_internal/cli/base_command.py", line 223, in _main
    status = self.run(options, args)
  File "/usr/lib/python3/dist-packages/pip/_internal/cli/req_command.py", line 180, in wrapper
    return func(self, options, args)
  File "/usr/lib/python3/dist-packages/pip/_internal/commands/install.py", line 297, in run
    session = self.get_default_session(options)
  File "/usr/lib/python3/dist-packages/pip/_internal/cli/req_command.py", line 78, in get_default_session
    self._session = self.enter_context(self._build_session(options))
  File "/usr/lib/python3/dist-packages/pip/_internal/cli/req_command.py", line 88, in _build_session
    session = PipSession(
  File "/usr/lib/python3/dist-packages/pip/_internal/network/session.py", line 248, in __init__
    self.headers["User-Agent"] = user_agent()
  File "/usr/lib/python3/dist-packages/pip/_internal/network/session.py", line 131, in user_agent
    zip(["name", "version", "id"], distro.linux_distribution()),
  File "/usr/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl/distro.py", line 125, in linux_distribution
    return _distro.linux_distribution(full_distribution_name)
  File "/usr/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl/distro.py", line 681, in linux_distribution
    self.version(),
  File "/usr/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl/distro.py", line 741, in version
    self.lsb_release_attr('release'),
  File "/usr/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl/distro.py", line 903, in lsb_release_attr
    return self._lsb_release_info.get(attribute, '')
  File "/usr/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl/distro.py", line 556, in __get__
    ret = obj.__dict__[self._fname] = self._f(obj)
  File "/usr/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl/distro.py", line 1014, in _lsb_release_info
    stdout = subprocess.check_output(cmd, stderr=devnull)
  File "/usr/lib/python3.9/subprocess.py", line 424, in check_output
    return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
  File "/usr/lib/python3.9/subprocess.py", line 528, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '('lsb_release', '-a')' returned non-zero exit status 1.
Failed to build 'glmark2'.

[Sylvain Pineau (sylvain-pineau)]

Note that we should only add it for jammy builds (not even sure it's available in the esm repo for 16.04)

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6a9dce9..6a904ad 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -134,6 +134,7 @@ parts:
     source: git://git.launchpad.net/checkbox-support
     stage-packages:
       # actual requirements
+      - python3-distro
       - python3-requests-unixsocket
       - python3-systemd
       # added to stage python:
@@ -163,9 +164,6 @@ parts:
     build-environment:
       - C_INCLUDE_PATH: /usr/include/python3.9
       - PYTHONPATH: $SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages:$PYTHONPATH
-    override-stage: |
-      snapcraftctl stage
-      sed -i 's|except OSError:  # Command not found|except subprocess.CalledProcessError:  # Command not found|g' lib/python3.*/site-packages/distro.py
 ################################################################################
   checkbox-ng:
     source-tag: ""