From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ya.ru; s=mail; t=1619707148; bh=BhuwjHjVw0iKKzBffjW9D6m8zKHb+sNZEYJRssTp6ls=; h=In-Reply-To:From:Date:References:To:Subject:Message-ID; b=sqCL6LB/P724TFeOhGIb/ZQ1eTQdfdPr1TJLrNgEHtkC58YEmvdXxrxinURvLneZP EiaQNbPIcaCC7uCVILRnnDyxSh5GxIRhiDQoQkZiYuPrNm67khfO8J7fwFFIrN15vN hS7NpNncT7ZIBSV/i5KUoo9V+Ban+VXNTxjO06XM= Authentication-Results: myt5-1f5ea18dd717.qloud-c.yandex.net; dkim=pass header.i=@ya.ru To: devel-distro@lists.altlinux.org References: <20210428123853.GA16601@imap.altlinux.org> <20210428135228.GA20076@imap.altlinux.org> From: =?UTF-8?B?0JDQvdGC0L7QvSDQnNC40LTRjtC60L7Qsg==?= Message-ID: <693ca654-eee4-8769-fa63-5f317b823e5a@ya.ru> Date: Thu, 29 Apr 2021 21:39:05 +0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210428135228.GA20076@imap.altlinux.org> Content-Type: text/plain; charset=utf-8 Content-Language: ru Content-Transfer-Encoding: 8bit Subject: Re: [devel-distro] [PATCH] reports.mk: Generate rpm and srpms lists X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2021 14:39:10 -0000 Archived-At: List-Archive: 28.04.2021 20:52, Michael Shigorin пишет: > On Wed, Apr 28, 2021 at 03:38:53PM +0300, Michael Shigorin wrote: >> PS: ещё немножко посмотрел этот скрипт -- не настаиваю на мерже >> последнего патча из приложенных трёх, но > >> >From 20642ae4aa3847403d3462e74ace4c00ca3240b3 Mon Sep 17 00:00:00 2001 >> From: Michael Shigorin >> Date: Wed, 28 Apr 2021 15:06:57 +0300 >> Subject: [PATCH 3/3] reports.mk: use process substitution to dedup >> >> The first half of both pipes was clearly a copy-pasted >> initial logfile processing; the file can be of considerable >> size (e.g. several megabytes) so it might be slightly more >> efficient and cool (but a bit more arcane) to use bash(1)'s > > Сам же написал -- bash; а SHELL по умолчанию будет sh. > >> process substitution along with good ol' tee(1) like this: >> >> --- a/reports.mk >> +++ b/reports.mk >> >> reports/packages: reports/prep >> - @grep -E 'chroot/.in/[^/]*.rpm' < $(BUILDLOG) | \ >> - cut -d' ' -f 1 | tr -d "'"'`' | sed 's,^.*/,,' | \ >> - sort -u > "$(REPORTDIR)/list-rpms.txt" >> @grep -E 'chroot/.in/[^/]*.rpm' < $(BUILDLOG) | \ >> cut -d' ' -f 1 | tr -d "'"'`' | \ >> + tee /dev/stderr 2> >(sed 's,^.*/,,' | \ >> + sort -u > "$(REPORTDIR)/list-rpms.txt") | \ >> xargs rpm -qp --queryformat '%{sourcerpm}\n' | \ >> sort -u > "$(REPORTDIR)/list-srpms.txt" > > По идее, на стадии report.mk нам уже нет дела до трассировки, > которая взводится в lib/report.mk накруткой на SHELL; > понадобится ещё вот такая строчка сперва: > > reports/packages: SHELL = /bin/bash > > Можно свести с предыдущим коммитом (если его забирать), > чтоб сразу был исправный. > Забрал, все четыре коммита. -- С уважением, Антон Мидюков