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=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,RP_MATCHES_RCVD,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=altlinux.org; s=dkim; h=Subject:In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:To:From:Date:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EzZWaoLc7HuR5vQfpv/lMy/1+5gZyhOgQFHj6wEnl5g=; b=pPXygCu+/+I8hANuZYonro5COj JzqkCsvetCA6Q77bDWureBmplxoGSXCin4S5SKMNaRn+9Fmp2EN+XqyTJjP5FmNVML7GrRtHarpeb cqXNdvXcNIy7jleOmkvkwc+CecWLK3snN84szwg16DsfHfHvNbF2T/X2vOUjgmVEySnP11Giudgit D6sOXrKmz8K9VV4bvLHBsK8hg5nPrUfJDDJEeeTxGTWD1rwAf9cT0VmI5AiQJztF8yFTmLGriaVgI bMuflAvQapBVR5kwCQeOocVCvm73RIGTxidtYYHN/kYoSJ9lCd54zLC4Gcm5NNf1LuiAtE7Nrga85 pyPl2ABQ==; Date: Tue, 1 Jan 2019 05:19:48 +0300 From: "Vladimir D. Seleznev" To: ALT Linux Team development discussions Message-ID: <20190101021948.GA1844@portlab> References: <20181231180802.B361A8440A0F@gitery.altlinux.org> <20190101012330.GA30145@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190101012330.GA30145@altlinux.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 46.39.228.49 X-SA-Exim-Mail-From: vseleznv@cs.msu.ru X-SA-Exim-Version: 4.2 X-SA-Exim-Scanned: Yes (on mail.cs.msu.ru) Subject: Re: [devel] [SCM] packages/sisyphus_check: heads/sisyphus X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jan 2019 02:20:02 -0000 Archived-At: List-Archive: List-Post: On Tue, Jan 01, 2019 at 04:23:30AM +0300, Dmitry V. Levin wrote: > Hi, > > On Mon, Dec 31, 2018 at 06:08:02PM +0000, Vladimir D. Seleznev wrote: > > Update of /people/vseleznv/packages/sisyphus_check.git > > > > Changes statistics since `0.8.45-alt1_lcc' follows: > > sisyphus_check/sisyphus_check.d/090-check-nvr | 4 ++-- > > sisyphus_check/sisyphus_check.spec | 5 ++++- > > 2 files changed, 6 insertions(+), 3 deletions(-) > > > > Changelog since `0.8.45-alt1_lcc' follows: > > commit 4492627dbc313159208167883c58f79be3127377 > > Author: Vladimir D. Seleznev > > Date: Mon Dec 31 21:07:25 2018 +0300 > > > > 0.8.46-alt1 > > > > - 090-check-nvr: make version and release check more strict > > > > commit ad0b8da88affed1a222e21e4dde3ad443e6a5340 > > Author: Vladimir D. Seleznev > > Date: Mon Dec 31 21:04:02 2018 +0300 > > > > 090-check-nvr: make version and release check more strict > > > > Full diff since `0.8.45-alt1_lcc' follows: > > diff --git a/sisyphus_check/sisyphus_check.d/090-check-nvr b/sisyphus_check/sisyphus_check.d/090-check-nvr > > index 6cb6f70..1c99af7 100644 > > --- a/sisyphus_check/sisyphus_check.d/090-check-nvr > > +++ b/sisyphus_check/sisyphus_check.d/090-check-nvr > > @@ -16,12 +16,12 @@ check_nvr() > > rc=1 > > fi > > > > - if printf %s "$rpm_version" |grep -qs '[%<=>]'; then > > + if ! printf %s "$rpm_version" |grep -Eqs '^[[:alnum:]._+]+$'; then > > У нас в Сизифе есть пакет ongres-scram-1.0.0~beta.2-alt1_5jpp8.src.rpm, > который эта проверка запретит. Пожалуй, это слишком строгая проверка, но старый rpm не умеет корректно обрабатывать пакеты со знаком тильда "~" в версии. Надо либо его научить, либо запретить такие версии, либо для разных репозиториев сделать разную проверку. > Допустим, я догадываюсь, зачем нужна именно такая более строгая проверка, > но это нужно указать явно в commit message. > > По технике, я бы предпочёл > > if printf %s "$rpm_version" |grep -qvx '[[:alnum:]][[:alnum:]._+]*'; then -- С уважением, Владимир Селезнев