etcupdate: Make diff -l actually work
ClosedPublic
Actions

Authored by des on Fri, May 29, 3:34 PM.

Details

Reviewers

ae
lytboris_gmail.com

Commits

rGc8b81d5ff2f4: etcupdate: Make diff -l actually work
rG70dfaf4521d4: etcupdate: Make diff -l actually work
rGa85e39030f8c: etcupdate: Make diff -l actually work

Summary

While here, remove unnecessary blank lines.

MFC after: 1 week
Fixes: 6d65c91b9a47 ("etcupdate: fix arguments order of diff command")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 73547
Build 70430: arc lint + arc unit

Event Timeline

des created this revision.Fri, May 29, 3:34 PM

Herald added a subscriber: imp. · View Herald TranscriptFri, May 29, 3:34 PM

des requested review of this revision.Fri, May 29, 3:34 PM

Harbormaster completed remote builds in B73547: Diff 178915.Fri, May 29, 3:34 PM

diff -l works for me as-is as intended:

>etcupdate diff -l

Changed: /etc/pam.d/ftpd

>etcupdate diff
Index: /etc/pam.d/ftpd
===================================================================
--- /etc/pam.d/ftpd (stock)
+++ /etc/pam.d/ftpd (local)
@@ -15,3 +15,4 @@

 # session
 session                required        pam_permit.so
+#XXX
\ No newline at end of file

Can you please provide an example where it fails to produce output needed?

# etcupdate diff -l | grep \^Changed
Changed: /etc/master.passwd
# etcupdate diff | grep \^Index     
Index: /etc/master.passwd
Index: /etc/pam.d/ftpd
Index: /etc/sysctl.conf
Index: /etc/group
Index: /etc/shells

lytboris_gmail.com accepted this revision.Wed, Jun 3, 10:59 AM

lytboris_gmail.com added a reviewer: lytboris_gmail.com.

This revision is now accepted and ready to land.Wed, Jun 3, 10:59 AM

Closed by commit rGa85e39030f8c: etcupdate: Make diff -l actually work (authored by des). · Explain WhyThu, Jun 4, 10:42 PM

This revision was automatically updated to reflect the committed changes.

des added a commit: rGa85e39030f8c: etcupdate: Make diff -l actually work.

des added a commit: rG70dfaf4521d4: etcupdate: Make diff -l actually work.Mon, Jun 8, 11:01 PM

des added a commit: rGc8b81d5ff2f4: etcupdate: Make diff -l actually work.