Unity System Compositor

Merge lp:~bregma/unity-system-compositor/lp-1676931 into lp:unity-system-compositor

lp-1676931
Merge into trunk

Proposed by Stephen M. Webb on 2017-03-28

Status:

Merged

Approved by:

Stephen M. Webb on 2017-04-03

Approved revision:

309

Merged at revision:

311

Proposed branch:

lp:~bregma/unity-system-compositor/lp-1676931

Merge into:

lp:unity-system-compositor

Prerequisite:

lp:~alan-griffiths/unity-system-compositor/compatibility

Diff against target:

42 lines (+16/-6)

1 file modified

debian/source_unity-system-compositor.py (+16/-6)

To merge this branch:

bzr merge lp:~bregma/unity-system-compositor/lp-1676931

Medium

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration	2017-03-28	Approve on 2017-04-03
Alexandros Frantzis (community)		2017-03-28	Approve on 2017-03-30
Review via email: mp+321225@code.launchpad.net

This proposal supersedes a proposal from 2017-03-28.

Commit message

added the lightdm log files to the apport dump for error reporting

Description of the change

Adds the lightdm log files to the apport dump for error reporting.

Previous versions had the wrong file names and if any file failed to attach (for example, it had the wrong name) none of the files would be attached.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:308
https://mir-jenkins.ubuntu.com/job/usc-ci/57/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/80/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4495
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4485
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4485
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4485
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/84/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/84/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/84/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/84/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/84/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/57/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2017-03-28: Posted in a previous version of this proposal

Change the following line in test_session_switcher.cpp

class StubMirSession : public mir::frontend::Session

class StubMirSession : public mir::frontend::Session, public mir::frontend::SessionExtensions

and it'll work.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28:

FAILED: Continuous integration, rev:308
https://mir-jenkins.ubuntu.com/job/usc-ci/58/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/81/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4497
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4487
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4487
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4487
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/85/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/85/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/85/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/85/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/85/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/58/rebuild

review: Needs Fixing (continuous-integration)

lp:~bregma/unity-system-compositor/lp-1676931 updated on 2017-03-28

309. By Stephen M. Webb on 2017-03-28: merge lp:~alan-griffiths/unity-system-compositor/compatibility

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-28:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/59/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2017-03-30:

Looks good.

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2017-04-03:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Chris Halse Rogers

Mir development team

Stephen M. Webb

Unity System Compositor Development Team

 === modified file 'debian/source_unity-system-compositor.py'
 --- debian/source_unity-system-compositor.py	2013-09-06 03:07:18 +0000
 +++ debian/source_unity-system-compositor.py	2017-03-28 22:20:05 +0000
@@ -1,3 +1,6 @@
++#!/usr/bin/python3
++
++import os
  from apport.hookutils import *
  def attach_graphic_card_pci_info(report, ui=None):
@@ -26,10 +29,18 @@
  def add_info(report, ui=None):
      attach_file_if_exists(report, '/var/log/boot.log', 'BootLog')
--    attach_root_command_outputs(report, { 'LightDMLog': 'cat /var/log/lightdm/lightdm.log',
--                                          'LightDMLogOld': 'cat /var/log/lightdm/lightdm.log.old',
--                                          'UnitySystemCompositorLog': 'cat /var/log/lightdm/unity-system-compositor.log',
--                                          'UnitySystemCompositorLogOld': 'cat /var/log/lightdm/unity-system-compositor.log.old' })
++
++    display_manager_files = {}
++    if os.path.lexists('/var/log/lightdm'):
++        display_manager_files['LightDMLog'] = \
++                'test -f /var/log/lightdm/lightdm.log && cat /var/log/lightdm/lightdm.log'
++        display_manager_files['LightDMLogOld'] = \
++                'test -f /var/log/lightdm/lightdm.log.1.gz && zcat /var/log/lightdm/lightdm.log.1.gz'
++        display_manager_files['USCLog'] = \
++                'test -f /var/log/lightdm/unity-system-compositor.log && cat /var/log/lightdm/unity-system-compositor.log'
++        display_manager_files['USCLogOld'] = \
++                'test -f /var/log/lightdm/unity-system-compositor.log.1.gz && zcat /var/log/lightdm/unity-system-compositor.log.1.gz'
++    attach_root_command_outputs(report, display_manager_files)
      report['version.libdrm'] = package_versions('libdrm2')
      report['version.lightdm'] = package_versions('lightdm')
@@ -45,7 +56,6 @@
      if not add_info(report, None):
          print("Unreportable")
          sys.exit(1)
--    keys = report.keys()
--    keys.sort()
++    keys = sorted(report.keys())
      for key in keys:
          print("[%s]\n%s\n" %(key, report[key]))