[Merge] ~seb128/ubuntu/+source/apport:desktop-installer-fixes into ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel

[Sebastien Bacher]

> I assume you're just running this in the snap? Running "ubuntu-bug ubuntu-desktop-bootstrap" fails outside of the snap. You can add the "Package" key to the report and then apport will give you the options to report against the "deb" instead of failing.

No, I'm testing on a desktop ISO live session, why would it behave differently in the snap environment?


> If you are expecting users to run this, you could use the hookutils.attach_root_command_outputs utility to collect multiple files with one permission elevation prompt. 

I don't understand that comment. There is only one use of root_command_output so why would be get several prompts? Also the hook is supposed to be used on the desktop ISO where sudo isn't prompting for password so in practice there is 0 prompt


> Lastly, if you are collecting subuity logs I recommend making the bug reports private by default since we are still unsure of the level of private information that gets leaked in the logs. (e.g. report["LaunchpadPrivate"] = "1" )

Ok, thanks for the suggestion. I've done that change now


Diff comments:

> diff --git a/debian/package-hooks/ubuntu-desktop-bootstrap.py b/debian/package-hooks/ubuntu-desktop-bootstrap.py
> index 4b39f9c..9ca734e 100644
> --- a/debian/package-hooks/ubuntu-desktop-bootstrap.py
> +++ b/debian/package-hooks/ubuntu-desktop-bootstrap.py
> @@ -22,21 +22,22 @@ def add_info(report, unused_ui):
>      ] = """\
>  {
>      "impl": "launchpad",
> -    "project": "ubuntu-desktop-bootstrap",
> +    "project": "ubuntu-desktop-provision",
>      "bug_pattern_url": "http://people.canonical.com/"
>      "~ubuntu-archive/bugpatterns/bugpatterns.xml",
>  }
>  """
>  
>      subiquitylog = os.path.realpath("/var/log/installer/subiquity-server-debug.log")
> -    hookutils.attach_file_if_exists(report, subiquitylog, "SubiquityLog")
> +    if os.path.exists(subiquitylog):
> +        report["SubiquityLog"] = hookutils.root_command_output(["cat", subiquitylog])
>  
>      hookutils.attach_file_if_exists(
>          report, "/var/log/installer/subiquity-curtin-install.conf", "CurtinConfig"

I've removed that part, we need the fix to land to be able to target LTS .1 so let's try to make landed as simple as possible

>      )
> -    hookutils.attach_file_if_exists(report, "/var/log/curtin/install.log", "CurtinLog")
> +    hookutils.attach_file_if_exists(report, "/var/log/installer/curtin-install.log", "CurtinLog")
>      hookutils.attach_file_if_exists(
> -        report, "/var/log/curtin/curtin-error-logs.tar", "CurtinError"
> +        report, "/var/log/installer/curtin-errors.tar", "CurtinError.tar"

On the desktop ISO the directory is using 770 with the adm user owning it and the default live session user is in the adm group so able to read the content

>      )
>  
>      hookutils.attach_file_if_exists(


-- 
https://code.launchpad.net/~seb128/ubuntu/+source/apport/+git/apport/+merge/469209
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~seb128/ubuntu/+source/apport:desktop-installer-fixes into ~ubuntu-core-dev/ubuntu/+source/apport:ubuntu/devel.