Page MenuHomeFreeBSD

etcupdate: Make diff -l actually work
ClosedPublic

Authored by des on Fri, May 29, 3:34 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Jun 19, 7:07 PM
Unknown Object (File)
Thu, Jun 18, 8:43 PM
Unknown Object (File)
Sat, Jun 13, 5:03 AM
Unknown Object (File)
Mon, Jun 8, 1:59 AM
Unknown Object (File)
Sun, Jun 7, 7:16 PM
Unknown Object (File)
Sat, Jun 6, 8:37 PM
Unknown Object (File)
Sat, Jun 6, 4:27 AM
Unknown Object (File)
Thu, Jun 4, 11:59 PM

Details

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 Not Applicable
Unit
Tests Not Applicable

Event Timeline

des requested review of this revision.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
This revision is now accepted and ready to land.Wed, Jun 3, 10:59 AM
This revision was automatically updated to reflect the committed changes.