Merge ~bryce/ubuntu/+source/logwatch:sru-lp1880211-groovy into ubuntu/+source/logwatch:ubuntu/groovy-devel

Proposed by Bryce Harrington
Status: Merged
Approved by: Bryce Harrington
Approved revision: ffedd599d3bf3d09fafd5cdd0fb2edb2a3a183bd
Merge reported by: Christian Ehrhardt 
Merged at revision: ffedd599d3bf3d09fafd5cdd0fb2edb2a3a183bd
Proposed branch: ~bryce/ubuntu/+source/logwatch:sru-lp1880211-groovy
Merge into: ubuntu/+source/logwatch:ubuntu/groovy-devel
Diff against target: 76 lines (+51/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/0010-zz-zfs-detect-zfs-location.patch (+42/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
git-ubuntu developers Pending
Canonical Server Pending
Review via email: mp+401258@code.staging.launchpad.net

Description of the change

This corrects an earlier URL that pulled in upstream's reimplementation of our proposed fix, but which actually introduced a regression. The new code assumed Perl's -x operator considers the $PATH, but it doesn't appear to do so. Instead, we need to explicitly check abspaths in order to find zfs.

This also tightens up requirements to require both `zfs` and `zpool` to be available, and not just assume if one is the other will too.

Note that installing zfsutils-linux in LXC seems to be pretty fussy about kernel module versions, so my testing has been a bit synthetic (and I suppose is why the original issue slipped through). So extra attention on testing in review would be appreciated.

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

Along the review I've done tho the Hirsute MP this LGTM
+1

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This appeared in -proposed and is in git-ubuntu

 logwatch | 7.4.3+git20161207-2ubuntu1.3 | bionic-proposed | source, all
 logwatch | 7.5.2-1ubuntu1.2 | focal-proposed | source, all
 logwatch | 7.5.4-0ubuntu3.1 | groovy-proposed | source, all

Setting to merged

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