[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Frysinger]

commit:     1bb3a73979d7023e7425b9a0acc1324070044278
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 02:35:52 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 02:35:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb3a739

eutils.eclass: epatch: clarify usage of --dry-run/-f flags when testing #565336

This should make the log a bit more clear as to the exact flags that are
used when calling patch when people review the log after the fact.

 eclass/eutils.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 7331796..c2a64e3 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -597,7 +597,7 @@ epatch() {
                        (
                        _epatch_draw_line "***** ${patchname} *****"
                        echo
-                       echo "PATCH COMMAND:  ${patch_cmd} < '${PATCH_TARGET}'"
+                       echo "PATCH COMMAND:  ${patch_cmd} --dry-run -f < 
'${PATCH_TARGET}'"
                        echo
                        _epatch_draw_line "***** ${patchname} *****"
                        ${patch_cmd} --dry-run -f < "${PATCH_TARGET}" 2>&1
@@ -612,6 +612,7 @@ epatch() {
                                _epatch_draw_line "***** ${patchname} *****"
                                echo
                                echo "ACTUALLY APPLYING ${patchname} ..."
+                               echo "PATCH COMMAND:  ${patch_cmd} < 
'${PATCH_TARGET}'"
                                echo
                                _epatch_draw_line "***** ${patchname} *****"
                                ${patch_cmd} < "${PATCH_TARGET}" 2>&1