Merge ~bryce/ubuntu/+source/logwatch:fix-unmatched-entries-groovy into ubuntu/+source/logwatch:ubuntu/devel

Proposed by Bryce Harrington
Status: Merged
Merged at revision: 50e66ce0bbbd8fa3efb5adda48d108a27112473b
Proposed branch: ~bryce/ubuntu/+source/logwatch:fix-unmatched-entries-groovy
Merge into: ubuntu/+source/logwatch:ubuntu/devel
Diff against target: 117 lines (+26/-14)
4 files modified
debian/changelog (+12/-0)
debian/patches/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch (+1/-1)
debian/patches/0018-audit-Treat-Denial-Errors-same-as-Denied.patch (+1/-1)
debian/patches/0021-audit-use-the-term-ALLOWED-instead-of-Grants.patch (+12/-12)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server Pending
Canonical Server packageset reviewers Pending
Review via email: mp+390342@code.staging.launchpad.net

Description of the change

In upstreaming the s/grants/allowed/ patch I noticed a typo in a variable name. This corrects that error, and updates a couple patches with changes identified during review of the SRU MP.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/logwatch-mp390212-unmatched-entries

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Yeah this all LGTM and is the natural closure of the discussion we had on the Focal MP.
+1

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks, pushed:

$ git push pkg fix-unmatched-entries-groovy upload/7.5.4-0ubuntu3
Enumerating objects: 27, done.
Counting objects: 100% (27/27), done.
Delta compression using up to 12 threads
Compressing objects: 100% (20/20), done.
Writing objects: 100% (20/20), 2.52 KiB | 1.26 MiB/s, done.
Total 20 (delta 15), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/logwatch
 * [new branch] fix-unmatched-entries-groovy -> fix-unmatched-entries-groovy
 * [new tag] upload/7.5.4-0ubuntu3 -> upload/7.5.4-0ubuntu3

$ dput ubuntu logwatch_7.5.4-0ubuntu3_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/Logwatch/project-xxx-unmatched-entries/logwatch_7.5.4-0ubuntu3_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/Logwatch/project-xxx-unmatched-entries/logwatch_7.5.4-0ubuntu3.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading logwatch_7.5.4-0ubuntu3.dsc: done.
  Uploading logwatch_7.5.4-0ubuntu3.debian.tar.xz: done.
  Uploading logwatch_7.5.4-0ubuntu3_source.buildinfo: done.
  Uploading logwatch_7.5.4-0ubuntu3_source.changes: done.
Successfully uploaded packages.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches