lp:~brian-murray/ubuntu/oneiric/apport/unreportable-pkg-conflict

Branch merges

Propose for merging

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

Kees Cook: Approve on 2011-08-12

Diff: 30 lines (+11/-1)

2 files modified

data/general-hooks/ubuntu.py (+4/-1)
debian/changelog (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1816. By Brian Murray on 2011-08-12

use the add_tag function for adding package-conflict as a tag

1815. By Brian Murray on 2011-08-12

fix logic error

1814. By Brian Murray on 2011-08-11

data/general-hooks/ubuntu.py: do not report package installation failures
where the conflicting package is not a genuine Ubuntu package

1813. By Marc Deslauriers on 2011-08-10

- fix versioning snafu

1812. By Marc Deslauriers on 2011-08-10

* Merge change from trunk:
  - apport/hookutils.py: properly detect as non-root when auditd is being
    used, use egrep as we're using an extended regex.

1811. By Steve Langasek on 2011-08-10

merge package install duplicate signature handling from Brian

1810. By Steve Langasek on 2011-08-04

merge from Brian

1809. By Stéphane Graber on 2011-07-27

Merge source_linux changes from Brian

1808. By Kees Cook on 2011-07-22

releasing version 1.21.2-0ubuntu8

1807. By Kees Cook on 2011-07-22

* data/package-hooks/source_linux.py:
  - ensure Oops with RIP get tagged with the kernel-driver