From 7475ef9d50a7cd5b878c9129186cacee572c4bd2 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 23 Oct 2020 13:57:21 +0000 Subject: [PATCH] Removed a time-restricted warning about changed options to bin/mkpatch - Legacy-Id: 18629 --- bin/mkpatch | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/bin/mkpatch b/bin/mkpatch index be17326e9..4379fdb5e 100755 --- a/bin/mkpatch +++ b/bin/mkpatch @@ -80,12 +80,14 @@ if [ "$(uname)" = "Linux" ]; then if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi eval set -- "$args" sed="sed -r" + date="date -d" else # Darwin, BSDs args=$(getopt -o$shortopts $SV $*) if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi set -- $args sed="sed -E" + date="date -j -f %Y-%m-%d" fi while true ; do @@ -105,16 +107,6 @@ done # ---------------------------------------------------------------------- # The program itself -today=$(date +%s) -until=$(date -d 2020-10-01 +%s) -if [ $today -lt $until ]; then - echo -e "\n** Please note that the --name switch must now be used if you want to specify"\ - "\n a name. If a changeset is given with the -c switch, the name can be"\ - "\n autogenerated from the commit comment, though."\ - "\n" -fi - - if [ "$CHG" ]; then if [ "$NAME" ]; then name="${NAME//_/-}-c$CHG"