| Message ID | 20180502200137.6870-1-malat@debian.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2 May 2018 at 23:01, Mathieu Malaterre <malat@debian.org> wrote: > Be nice to the user and check env vars KBUILD_BUILD_USER & > KBUILD_BUILD_HOST when those are set. > > Since DEBEMAIL accept a syntax where the full name is present, be extra > nice to user and extract email address only. > Cc: Riku Voipio <riku.voipio@linaro.org> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > v2: update patch since syntax of DEBEMAIL may contain full name > > scripts/package/mkdebian | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index 6adb3a16ba3b..3f4e43446db3 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -73,9 +73,19 @@ fi > > # Try to determine maintainer and email values > if [ -n "$DEBEMAIL" ]; then > - email=$DEBEMAIL > + case "$DEBEMAIL" in > + *\ * ) > + email=$(echo $DEBEMAIL | cut -d '<' -f2 | cut -d '>' -f1) Why go through all the trouble of deconstructing the string and then reassemble it a few lines down in the script? I'll submit an alternative way to handle the Maintainer address setting. > + echo >&2 "Extracting email from DEBEMAIL. Use DEBFULLNAME instead." > + ;; > + *) > + email=$DEBEMAIL > + ;; > + esac > elif [ -n "$EMAIL" ]; then > email=$EMAIL > +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then > + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST > else > email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) > fi > -- > 2.11.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 2, 2018 at 10:01 PM, Mathieu Malaterre <malat@debian.org> wrote: > Be nice to the user and check env vars KBUILD_BUILD_USER & > KBUILD_BUILD_HOST when those are set. > > Since DEBEMAIL accept a syntax where the full name is present, be extra > nice to user and extract email address only. > > Cc: Riku Voipio <riku.voipio@linaro.org> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > v2: update patch since syntax of DEBEMAIL may contain full name Should be replaced by: https://lists.debian.org/debian-kernel/2018/05/msg00029.html > scripts/package/mkdebian | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index 6adb3a16ba3b..3f4e43446db3 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -73,9 +73,19 @@ fi > > # Try to determine maintainer and email values > if [ -n "$DEBEMAIL" ]; then > - email=$DEBEMAIL > + case "$DEBEMAIL" in > + *\ * ) > + email=$(echo $DEBEMAIL | cut -d '<' -f2 | cut -d '>' -f1) > + echo >&2 "Extracting email from DEBEMAIL. Use DEBFULLNAME instead." > + ;; > + *) > + email=$DEBEMAIL > + ;; > + esac > elif [ -n "$EMAIL" ]; then > email=$EMAIL > +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then > + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST > else > email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) > fi > -- > 2.11.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 6adb3a16ba3b..3f4e43446db3 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -73,9 +73,19 @@ fi # Try to determine maintainer and email values if [ -n "$DEBEMAIL" ]; then - email=$DEBEMAIL + case "$DEBEMAIL" in + *\ * ) + email=$(echo $DEBEMAIL | cut -d '<' -f2 | cut -d '>' -f1) + echo >&2 "Extracting email from DEBEMAIL. Use DEBFULLNAME instead." + ;; + *) + email=$DEBEMAIL + ;; + esac elif [ -n "$EMAIL" ]; then email=$EMAIL +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST else email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) fi
Be nice to the user and check env vars KBUILD_BUILD_USER & KBUILD_BUILD_HOST when those are set. Since DEBEMAIL accept a syntax where the full name is present, be extra nice to user and extract email address only. Cc: Riku Voipio <riku.voipio@linaro.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Mathieu Malaterre <malat@debian.org> --- v2: update patch since syntax of DEBEMAIL may contain full name scripts/package/mkdebian | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)