lp:~brian-murray/ubuntu/oneiric/apport/conffile-handling

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu at revision 1802

Martin Pitt: Approve on 2011-07-21

Diff: 76 lines (+22/-4) (has conflicts)

3 files modified

apport/hookutils.py (+9/-2)
data/general-hooks/ubuntu.py (+2/-2)
debian/changelog (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #811203: modified conf file contents attached by apport without asking

High

Fix Released

Link a bug report

Related blueprints

1802. By Brian Murray on 2011-07-20

modifications based off reviewer feedback

1801. By Brian Murray on 2011-07-19

* apport/hookutils.py:
  - raise a yes no dialog in the event a conffile has been modified
    (LP: #811203)

1800. By Martin Pitt on 2011-07-19

releasing version 1.21.2-0ubuntu5

1799. By Martin Pitt on 2011-07-19

* data/general-hooks/ubuntu.py:
  - Check DpkgTerminalLog for more cases that indicate the bug report should
    be filed about grub2
* data/package-hooks/source_linux.py:
  - kerneloops was a transitional package we want the version of
    kerneloops-daemon

1798. By Martin Pitt on 2011-07-14

releasing version 1.21.2-0ubuntu4

1797. By Martin Pitt on 2011-07-14

* Merge changes from trunk:
  - gtk/apport-gtk.desktop.in: Also show in Unity. (LP: #803519)
  - apport-unpack: Fix crash on file errors.
  - hookutils.py: Add attach_mac_events() for reporting logs of MAC systems.
    Looks for AppArmor messages for now. Thanks Marc Deslauriers!

1796. By Martin Pitt on 2011-07-14

* data/package-hooks/source_linux.py:
  - tag kerneloops reports with the driver the Oops occurred in
  - include kerneloops package version in kerneloops reports

1795. By Martin Pitt on 2011-07-14

releasing version 1.21.2-0ubuntu3

1794. By Martin Pitt on 2011-07-14

data/general-hooks/ubuntu.py: add in casper package version to bugs
reported from Live Media

1793. By Barry Warsaw on 2011-07-07

* data/package-hooks/source_ubiquity.py:
  - Check syslog for squashfs errors and do not report
  - Ask before adding installer debug log file (LP: #773766)