1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH] epatch.eclass: call ebegin to balance eend

    From Mike Gilbert@21:1/5 to All on Mon Jun 27 21:00:01 2022
    Signed-off-by: Mike Gilbert <floppym@gentoo.org>
    ---
    eclass/epatch.eclass | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
    index 6a9c460da0a..6d000419b03 100644
    --- a/eclass/epatch.eclass
    +++ b/eclass/epatch.eclass
    @@ -236,12 +236,12 @@ epatch() {

    if [[ ${SINGLE_PATCH} == "yes" ]] ; then
    if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
    - einfo "${EPATCH_SINGLE_MSG}"
    + ebegin "${EPATCH_SINGLE_MSG}"
    else
    - einfo "Applying ${patchname} ..."
    + ebegin "Applying ${patchname}"
    fi
    else
    - einfo " ${patchname} ..."
    + ebegin " ${patchname}"
    fi

    # Handle aliased patch command #404447 #461568
    --
    2.36.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Ulrich Mueller@21:1/5 to All on Tue Jun 28 08:10:01 2022
    On Mon, 27 Jun 2022, Mike Gilbert wrote:

    if [[ ${SINGLE_PATCH} == "yes" ]] ; then
    if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
    - einfo "${EPATCH_SINGLE_MSG}"
    + ebegin "${EPATCH_SINGLE_MSG}"
    else
    - einfo "Applying ${patchname} ..."
    + ebegin "Applying ${patchname}"
    fi

    EPATCH_SINGLE_MSG isn't used in the tree, so this could be simplified to
    have the "else" part only, and delete the eclass variable. (Strange idea
    to make this message configurable, in the first place.)

    else
    - einfo " ${patchname} ..."
    + ebegin " ${patchname}"
    fi

    Maybe drop support for EAPIs 0 to 4 while at it?

    Ulrich

    -----BEGIN PGP SIGNATURE-----

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmK6mjQPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4ucwMH/jNL/05p9eGLct7w6SP30f+TH9aLD1sAvDyz uf96QQ8cTm4HCmf+K7S1+1rKpqrJl8HQAk92xTVVK9oZhHKxZmQK4/ZEEYHo1itU s/6v76n40WS0u7dd5ofU4QqNasmlNQzY0XNIexSISUwTx3ZrvmSvvxIjjED7gcZG 3aDkKG8leSdTGF1fE/d2tCMBloqC0OCyrph5+WJgJ392y03+E8LQcHoph1uHJ3MF tkrxKAEF06WQDz7cbw6Od7mbtl970UxVyE3mZrE/TnJc8S2K+jpuB2AZ6Oci3XHw LJkgT5hdr6DTe8qUlxmXRD5Yq7O7qBuZUA8nb+6px2Md7ksMu3k=
    =kckN
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Mike Gilbert@21:1/5 to ulm@gentoo.org on Tue Jun 28 20:10:01 2022
    On Tue, Jun 28, 2022 at 2:05 AM Ulrich Mueller <ulm@gentoo.org> wrote:

    On Mon, 27 Jun 2022, Mike Gilbert wrote:

    if [[ ${SINGLE_PATCH} == "yes" ]] ; then
    if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
    - einfo "${EPATCH_SINGLE_MSG}"
    + ebegin "${EPATCH_SINGLE_MSG}"
    else
    - einfo "Applying ${patchname} ..."
    + ebegin "Applying ${patchname}"
    fi

    EPATCH_SINGLE_MSG isn't used in the tree, so this could be simplified to
    have the "else" part only, and delete the eclass variable. (Strange idea
    to make this message configurable, in the first place.)

    else
    - einfo " ${patchname} ..."
    + ebegin " ${patchname}"
    fi

    Maybe drop support for EAPIs 0 to 4 while at it?

    I made both changes on the github PR.

    https://github.com/gentoo/gentoo/pull/26122

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)