From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gladkov.alexey@gmail.com>
Date: Tue, 26 Oct 2021 13:14:29 +0200
From: Alexey Gladkov <gladkov.alexey@gmail.com>
To: make-initrd@lists.altlinux.org
Message-ID: <20211026111429.y3m2lce3riyosddd@example.org>
References: <20211024172039.D6F8EA5E4C@lists.altlinux.org>
 <20211026092039.qbp5trecvufr7ve4@example.org>
 <e1414c1c-fa33-e9ac-e86e-34821547df47@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <e1414c1c-fa33-e9ac-e86e-34821547df47@gmail.com>
Subject: Re: [make-initrd] [PATCH v6 05/22] bootchain-core,
 bootchain-waitdev: whitespace
X-BeenThere: make-initrd@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: make-initrd@lists.altlinux.org
List-Id: <make-initrd.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/make-initrd>,
 <mailto:make-initrd-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/make-initrd>
List-Post: <mailto:make-initrd@lists.altlinux.org>
List-Help: <mailto:make-initrd-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/make-initrd>,
 <mailto:make-initrd-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Oct 2021 11:14:31 -0000
Archived-At: <http://lore.altlinux.org/make-initrd/20211026111429.y3m2lce3riyosddd@example.org/>
List-Archive: <http://lore.altlinux.org/make-initrd/>

On Tue, Oct 26, 2021 at 12:51:14PM +0300, Leonid Krivoshein wrote:
> 
> 26.10.2021 12:20, Alexey Gladkov пишет:
> > On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote:
> > > Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
> > > ---
> > >   .../data/bin/bootchain-sh-functions           | 28 +++++++++++--------
> > >   features/bootchain-core/data/sbin/chaind      |  6 ++--
> > >   .../data/lib/bootchain/waitdev                |  1 +
> > >   3 files changed, 21 insertions(+), 14 deletions(-)
> > > 
> > > diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
> > > index fa6201f..f337767 100644
> > > --- a/features/bootchain-core/data/bin/bootchain-sh-functions
> > > +++ b/features/bootchain-core/data/bin/bootchain-sh-functions
> > > @@ -9,9 +9,11 @@ __bootchain_sh_functions=1
> > >   handlerdir=/lib/bootchain
> > >   [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
> > > +
> > >   check_parameter()
> > >   {
> > >   	local v
> > > +
> > >   	eval "v=\"\${$1-}\""
> > >   	[ -n "$v" ] ||
> > >   		fatal "Parameter '$1' required"
> > > @@ -25,20 +27,22 @@ get_parameter()
> > >   resolve_target()
> > >   {
> > >   	local target="$1"
> > > +
> > >   	case "${target%%/*}" in
> > > -		'')
> > > -			;;
> > > -		pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> > > -			target="$mntdir/dst/step${target:4}"
> > > -			;;
> > > -		*)
> > > -			if [ -z "${prevdir-}" ]; then
> > > -				message "no previous stop to use"
> > > -				return
> > > -			fi
> > > -			target="$prevdir/${target#/}"
> > > -			;;
> > > +	'')
> > > +		;;
> > > +	pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> > > +		target="$mntdir/dst/step${target:4}"
> > > +		;;
> > > +	*)
> > > +		if [ -z "${prevdir-}" ]; then
> > > +			message "no previous stop to use"
> > > +			return
> > > +		fi
> > > +		target="$prevdir/${target#/}"
> > > +		;;
> > Это неправильное форматирование. Остальной код отформатирован иначе:
> > 
> > git grep -A1 'case "' features/
> 
> Понял, это я прощёлкал. Переделаю.
> 
> 
> > 
> > >   	esac
> > > +
> > >   	printf '%s' "$target"
> > >   }
> > > diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
> > > index d401101..08e5e58 100755
> > > --- a/features/bootchain-core/data/sbin/chaind
> > > +++ b/features/bootchain-core/data/sbin/chaind
> > > @@ -7,6 +7,7 @@ message_time=1
> > >   pidfile="/var/run/$PROG.pid"
> > >   logfile="/var/log/$PROG.log"
> > > +
> > >   exit_handler()
> > >   {
> > >   	local rc="$?"
> > > @@ -15,6 +16,7 @@ exit_handler()
> > >   	exit $rc
> > >   }
> > > +
> > >   [ ! -f "$pidfile" ] ||
> > >   	fatal "already running"
> > > @@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
> > >   			export name callnum datadir destdir prevdir
> > > -			rc=0
> > > -			"$exe" || rc=$?
> > > +				rc=0
> > > +				"$exe" || rc=$?
> > А это вообще ошибка в форматировании.
> 
> Переделаю. Да, здесь whitespace слишком преждевременно (#05->16) для
> уменьшения diff. Вопрос в том, как лучше переделать? Сделать отдельный
> коммит whitespace перед коммитом, где тут ожидается изменение (#16), или
> чёрт с ним, со сдвигом? Просто удалятся и добавятся две строки, по diff и
> так будет понятно, что это старый код.

Оставь пока так. Просто в следующей версии выкини этот коммит.

> 
> > >   			if [ "$rc" != 0 ]; then
> > >   				[ "$rc" != 2 ] ||
> > > diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> > > index 74af6ea..bc81673 100755
> > > --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
> > > +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> > > @@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
> > >   			break
> > >   		fi
> > >   	fi
> > > +
> > >   	sleep 1
> > >   done
> > > -- 
> > > 2.24.1
> > > 
> > > _______________________________________________
> > > Make-initrd mailing list
> > > Make-initrd@lists.altlinux.org
> > > https://lists.altlinux.org/mailman/listinfo/make-initrd
> > > 
> 
> -- 
> Best regards,
> Leonid Krivoshein.
> 
> _______________________________________________
> Make-initrd mailing list
> Make-initrd@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/make-initrd

-- 
Rgrds, legion