[Merge] ~ubuntu-core-dev/ubuntu/+source/apport:subiquity-desktop-details into ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel

[Benjamin Drung]

Review: Needs Fixing



Diff comments:

> diff --git a/debian/patches/Add-package-hooks.patch b/debian/patches/Add-package-hooks.patch
> index 894c64f..a10078c 100644
> --- a/debian/patches/Add-package-hooks.patch
> +++ b/debian/patches/Add-package-hooks.patch
> @@ -541,11 +537,19 @@ index 0000000..c99ccb6
>  +    hookutils.attach_file_if_exists(
>  +        report, "/var/log/installer/block/probe-data.json", "ProbeData"
>  +    )
> -diff --git a/data/package-hooks/ubuntu-desktop-installer.py b/data/package-hooks/ubuntu-desktop-installer.py
> -new file mode 100644
> -index 0000000..3a20f0d
> ---- /dev/null
> -+++ b/data/package-hooks/ubuntu-desktop-installer.py
> ++
> ++    # collect desktop installer details if available
> ++    desktoplog = os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log")
> ++    if os.path.exists(desktoplog):
> ++        hookutils.attach_file(report, desktoplog, "DesktopInstallerLog")
> ++        report["Tags"] += " ubuntu-desktop-installer"

Can be simplified to `report.add_tags(["ubuntu-desktop-installer"])`

> ++        snapdir = os.path.realpath("/snap/ubuntu-desktop-installer/current")
> ++        if os.path.exists(snapdir):
> ++            report["DesktopInstallerRev"]= os.path.basename(snapdir)
> +Index: apport/data/package-hooks/ubuntu-desktop-installer.py
> +===================================================================
> +--- /dev/null	1970-01-01 00:00:00.000000000 +0000
> ++++ apport/data/package-hooks/ubuntu-desktop-installer.py	2023-04-03 21:06:14.103820411 +0200
>  @@ -0,0 +1,46 @@
>  +"""Send reports about ubuntu-desktop-installer to the correct Launchpad
>  +project."""


-- 
https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/apport/+git/apport/+merge/440270
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel.