* Re: [devel] [SCM] packages/sisyphus_check: heads/sisyphus @ 2019-01-01 1:23 ` Dmitry V. Levin 2019-01-01 2:19 ` Vladimir D. Seleznev 2019-01-01 22:31 ` Dmitry V. Levin 0 siblings, 2 replies; 3+ messages in thread From: Dmitry V. Levin @ 2019-01-01 1:23 UTC (permalink / raw) To: ALT Devel discussion list [-- Attachment #1: Type: text/plain, Size: 1729 bytes --] 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 <vseleznv@altlinux.org> > 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 <vseleznv@altlinux.org> > 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, который эта проверка запретит. Допустим, я догадываюсь, зачем нужна именно такая более строгая проверка, но это нужно указать явно в commit message. По технике, я бы предпочёл if printf %s "$rpm_version" |grep -qvx '[[:alnum:]][[:alnum:]._+]*'; then -- ldv [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [devel] [SCM] packages/sisyphus_check: heads/sisyphus 2019-01-01 1:23 ` [devel] [SCM] packages/sisyphus_check: heads/sisyphus Dmitry V. Levin @ 2019-01-01 2:19 ` Vladimir D. Seleznev 2019-01-01 22:31 ` Dmitry V. Levin 1 sibling, 0 replies; 3+ messages in thread From: Vladimir D. Seleznev @ 2019-01-01 2:19 UTC (permalink / raw) To: ALT Linux Team development discussions 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 <vseleznv@altlinux.org> > > 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 <vseleznv@altlinux.org> > > 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 -- С уважением, Владимир Селезнев ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [devel] [SCM] packages/sisyphus_check: heads/sisyphus 2019-01-01 1:23 ` [devel] [SCM] packages/sisyphus_check: heads/sisyphus Dmitry V. Levin 2019-01-01 2:19 ` Vladimir D. Seleznev @ 2019-01-01 22:31 ` Dmitry V. Levin 1 sibling, 0 replies; 3+ messages in thread From: Dmitry V. Levin @ 2019-01-01 22:31 UTC (permalink / raw) To: ALT Devel discussion list [-- Attachment #1: Type: text/plain, Size: 324 bytes --] On Tue, Jan 01, 2019 at 04:23:30AM +0300, Dmitry V. Levin wrote: [...] > По технике, я бы предпочёл > > if printf %s "$rpm_version" |grep -qvx '[[:alnum:]][[:alnum:]._+]*'; then Или printf %s "$rpm_version" |grep -qx '[[:alnum:]][[:alnum:]._+]*' || { - так отказоустойчивее и проще тестировать. -- ldv [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-01 22:31 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-01-01 1:23 ` [devel] [SCM] packages/sisyphus_check: heads/sisyphus Dmitry V. Levin 2019-01-01 2:19 ` Vladimir D. Seleznev 2019-01-01 22:31 ` Dmitry V. Levin
ALT Linux Team development discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \ devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru public-inbox-index devel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git