Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch: pod update for --ifdef #712

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Conversation

mknos
Copy link
Contributor

@mknos mknos commented Aug 12, 2024

  • Remove note about GNU patch requiring a space between -D and argument (this might have been true for ancient versions but not anymore)
  • This version of patch outputs a trailing comment for the ifndef blocks; the OpenBSD version does this also
%ifconfig > A
%sed 's/eth0/ent0/' A > B
%perl diff -u A B > AB.diff 
%/usr/bin/patch --version 
GNU patch 2.7.6
%/usr/bin/patch -Dostuff -o C A AB.diff
patching file C (read from A)
%perl patch -Dostuff -o D A AB.diff
Hmm...  Looks like a unified diff to me...
Patching file A using Plan B...
Hunk #1 succeeded at 1.
done
%perl diff C D 
5c5
< #endif
---
> #endif /* ostuff */

* Remove note about GNU patch requiring a space between -D and argument (this might've been the case for ancient versions but not anymore)
* This version of patch outputs a trailing comment for the ifndef blocks; this matches the OpenBSD version

%ifconfig > A
%sed 's/eth0/ent0/' A > B
%perl diff -u A B > AB.diff 
%/usr/bin/patch --version 
GNU patch 2.7.6
%/usr/bin/patch -Dostuff -o C A AB.diff
patching file C (read from A)
%perl patch -Dostuff -o D A AB.diff
Hmm...  Looks like a unified diff to me...
Patching file A using Plan B...
Hunk briandfoy#1 succeeded at 1.
done
%perl diff C D 
5c5
< #endif
---
> #endif /* ostuff */
@github-actions github-actions bot added Type: enhancement improve a feature that already exists Priority: low get to this whenever Program: patch The patch program labels Aug 12, 2024
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:12 — with GitHub Actions Inactive
@mknos mknos temporarily deployed to automated_testing August 12, 2024 05:13 — with GitHub Actions Inactive
@coveralls
Copy link

coveralls commented Aug 12, 2024

Pull Request Test Coverage Report for Build 10346257467

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.7%) to 73.069%

Totals Coverage Status
Change from base Build 10316135952: -0.7%
Covered Lines: 350
Relevant Lines: 479

💛 - Coveralls

@briandfoy briandfoy merged commit 1318027 into briandfoy:master Aug 12, 2024
22 of 23 checks passed
@briandfoy
Copy link
Owner

changes: update to docs for modern GNU version of -D

@briandfoy briandfoy added Status: accepted The fix is accepted and removed Priority: low get to this whenever labels Aug 12, 2024
@briandfoy briandfoy added Status: released there is a new release with this fix and removed Status: accepted The fix is accepted labels Sep 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Program: patch The patch program Status: released there is a new release with this fix Type: enhancement improve a feature that already exists
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants