Merge ~seb128/ubuntu/+source/apport:ubuntu-desktop-bootstrap into ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel

[Sebastien Bacher]

[Sebastien Bacher (seb128)]

The ubuntu-desktop-installer project got deprecated in favor of ubuntu-desktop-provision in noble, the new snap we use for the desktop is ubuntu-desktop-bootstrap

[Benjamin Drung (bdrung)]

The change looks good. Merged. It will be included in the upcoming apport release next week.

review: Approve

diff --git a/debian/package-hooks/subiquity.py b/debian/package-hooks/subiquity.py
index 948a8e7..0e7a406 100644
--- a/debian/package-hooks/subiquity.py
+++ b/debian/package-hooks/subiquity.py
@@ -42,10 +42,10 @@ def add_info(report, unused_ui):
     )
 
     # collect desktop installer details if available
-    desktoplog = os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log")
+    desktoplog = os.path.realpath("/var/log/installer/ubuntu_bootstrap.log")
     if os.path.exists(desktoplog):
         hookutils.attach_file(report, desktoplog, "DesktopInstallerLog")
-        report.add_tags(["ubuntu-desktop-installer"])
-        snapdir = os.path.realpath("/snap/ubuntu-desktop-installer/current")
+        report.add_tags(["ubuntu-desktop-bootstrap"])
+        snapdir = os.path.realpath("/snap/ubuntu-desktop-bootstrap/current")
         if os.path.exists(snapdir):
             report["DesktopInstallerRev"] = os.path.basename(snapdir)
diff --git a/debian/package-hooks/ubuntu-desktop-installer.py b/debian/package-hooks/ubuntu-desktop-bootstrap.py
similarity index 83%
rename from debian/package-hooks/ubuntu-desktop-installer.py
rename to debian/package-hooks/ubuntu-desktop-bootstrap.py
index 6043cfe..4b39f9c 100644
--- a/debian/package-hooks/ubuntu-desktop-installer.py
+++ b/debian/package-hooks/ubuntu-desktop-bootstrap.py
@@ -1,4 +1,4 @@
-"""Send reports about ubuntu-desktop-installer to the correct Launchpad
+"""Send reports about ubuntu-desktop-bootstrap to the correct Launchpad
 project."""
 
 # pylint: disable=invalid-name
@@ -10,19 +10,19 @@ from apport import hookutils
 
 
 def add_info(report, unused_ui):
-    """Send reports about ubuntu-desktop-installer to the correct Launchpad
+    """Send reports about ubuntu-desktop-bootstrap to the correct Launchpad
     project."""
-    udilog = os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log")
-    hookutils.attach_file_if_exists(report, udilog, "UdiLog")
+    udblog = os.path.realpath("/var/log/installer/ubuntu_bootstrap.log")
+    hookutils.attach_file_if_exists(report, udblog, "UdbLog")
 
-    report["SourcePackage"] = "ubuntu-desktop-installer"
+    report["SourcePackage"] = "ubuntu-desktop-bootstrap"
     # rewrite this section so the report goes to the project in Launchpad
     report[
         "CrashDB"
     ] = """\
 {
     "impl": "launchpad",
-    "project": "ubuntu-desktop-installer",
+    "project": "ubuntu-desktop-bootstrap",
     "bug_pattern_url": "http://people.canonical.com/"
     "~ubuntu-archive/bugpatterns/bugpatterns.xml",
 }