[Merge] lp:~tdaitx/ubuntu/focal/apport/lp-1853383-fix into lp:~ubuntu-core-dev/ubuntu/focal/apport/ubuntu

[Brian Murray]

This didn't actually work but I'll fix it up.

Diff comments:

> 
> === modified file 'apport/ui.py'
> --- apport/ui.py	2020-01-09 14:48:33 +0000
> +++ apport/ui.py	2020-02-20 21:19:11 +0000
> @@ -243,11 +243,11 @@
>              logind_session = None
>          else:
>              reports = apport.fileutils.get_new_reports()
> -            if PY3:
> +            if _python2:

_python2 is not defined in apport/ui.py - this needs fixing to "if not PY3" which I'll do.

> +                logind_session = apport.Report.get_logind_session(os.getpid())
> +            else:
>                  proc_pid_fd = os.open('/proc/%s' % os.getpid(), os.O_RDONLY | os.O_PATH | os.O_DIRECTORY)
>                  logind_session = apport.Report.get_logind_session(proc_pid_fd=proc_pid_fd)
> -            else:
> -                logind_session = apport.Report.get_logind_session(os.getpid())
>  
>          for f in reports:
>              if not self.load_report(f):


-- 
https://code.launchpad.net/~tdaitx/ubuntu/focal/apport/lp-1853383-fix/+merge/379589
Your team Ubuntu Core Development Team is subscribed to branch lp:~ubuntu-core-dev/ubuntu/focal/apport/ubuntu.