launchpad: don't systematically order retrace on private reports

Just because a report is marked as LaunchpadPrivate and has an actual
architecture attached to it doesn't mean it should be retraced. A
contrario, any report that is designated as LaunchpadPrivate should be
marked as private, even if get_os_info() was never called on it.

Fixes https://bugs.launchpad.net/ubuntu/+source/apport/+bug/2068933

apport/crashdb_impl/launchpad.py

@@ -1141,9 +1141,11 @@ def _enforce_privacy_for_distro_reports(
         # FIXME: ugly hack until LP has a real crash db
         if "DistroRelease" not in report:
             return
-        if arch and (
-            "VmCore" in report or "CoreDump" in report or "LaunchpadPrivate" in report
-        ):
+
+        if "LaunchpadPrivate" in report:
+            hdr["Private"] = "yes"
+
+        if arch and ("VmCore" in report or "CoreDump" in report):
             hdr["Private"] = "yes"
             hdr["Subscribers"] = report.get(
                 "LaunchpadSubscribe", self.options.get("initial_subscriber", "apport")

tests/unit/test_launchpad.py

@@ -9,6 +9,8 @@
 
 """Unit tests for apport.crash_impl.launchpad"""
 
+import re
+
 from apport.crashdb_impl.launchpad import CrashDatabase
 from apport.report import Report
 
@@ -88,3 +90,4 @@ def test_private_bug_headers():
     headers = crashdb._generate_upload_headers(report)
 
     assert headers.get("Private") == "yes"
+    assert not re.match(r"need-[a-z0-9]-retrace", headers.get("Tags", ""))