From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 1552F469710 for ; Tue, 24 Nov 2020 12:56:28 +0300 (MSK) Received: by smtp49.i.mail.ru with esmtpa (envelope-from ) id 1khV3j-0003xn-Lx for tarantool-patches@dev.tarantool.org; Tue, 24 Nov 2020 12:56:27 +0300 References: <1606135490.402722701@f311.i.mail.ru> From: Oleg Koshovetc Message-ID: <5520a5ab-63d1-e1ba-a9b4-d433b9320b5b@tarantool.org> Date: Tue, 24 Nov 2020 12:55:50 +0300 MIME-Version: 1.0 In-Reply-To: <1606135490.402722701@f311.i.mail.ru> Content-Type: multipart/alternative; boundary="------------DA62AACAB86C984E7ABB31A7" Content-Language: en-US Subject: [Tarantool-patches] Fwd: Self: Re: Fwd: [PATCH v1 3/3] update_repo: correct remove routine List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tarantool-patches@dev.tarantool.org This is a multi-part message in MIME format. --------------DA62AACAB86C984E7ABB31A7 Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit LGTM NIT: lp$( echo $option_dist | sed 's#\.##g’ ).1.1 would be a little more readable -- Oleg Koshovetc Пятница, 20 ноября 2020, 14:57 +03:00 от Alexander Tikhonov : -------- Пересылаемое сообщение -------- От кого: Alexander V. Tikhonov > Кому: Kirill Yukhin > Копия: Alexander V. Tikhonov >, tarantool-patches@dev.tarantool.org Дата: Воскресенье, 25 октября 2020, 11:37 +03:00 Тема: [PATCH v1 3/3] update_repo: correct remove routine Implemented ability to remove opensuse-leap OS packages. ---  tools/update_repo.sh | 11 ++++++++++-  1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/update_repo.sh b/tools/update_repo.sh index 0d39f108d..581539719 100755 --- a/tools/update_repo.sh +++ b/tools/update_repo.sh @@ -881,7 +881,16 @@ function remove_rpm {      # broken update left orphan files: they are present in the      # storage, but does not mentioned in the metadata.      for suffix in 'x86_64' 'noarch' 'src'; do - file="$bucket_path/$packpath/${remove}-1.${os}${option_dist}.${suffix}.rpm" + if [ "$os" == "opensuse-leap" ]; then + # Open Build Service (openSUSE) does not follow the usual + # approach: 'Release' is like lp152.1.1, where the first + # '1' is $(RELEASE) RPM spec directive value and the second + # '1' is the number of rebuilds. + os_dist="lp"`echo $option_dist | sed 's#\.##g'`".1.1" + else + os_dist="1.${os}${option_dist}" + fi + file="$bucket_path/$packpath/${remove}-${os_dist}.${suffix}.rpm"          echo "Searching to remove: $file"          $aws ls $file || continue          $aws rm $file -- 2.25.1 ------------------------------------------------------------------------ -- Alexander Tikhonov --------------DA62AACAB86C984E7ABB31A7 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit LGTM

NIT:
lp$( echo $option_dist | sed 's#\.##g’ ).1.1 would be a little more readable
 
--
Oleg Koshovetc
 
 
Пятница, 20 ноября 2020, 14:57 +03:00 от Alexander Tikhonov <avtikhon@tarantool.org>:
 



-------- Пересылаемое сообщение --------
От кого: Alexander V. Tikhonov <avtikhon@tarantool.org>
Кому: Kirill Yukhin <kyukhin@tarantool.org>
Копия: Alexander V. Tikhonov <avtikhon@tarantool.org>, tarantool-patches@dev.tarantool.org
Дата: Воскресенье, 25 октября 2020, 11:37 +03:00
Тема: [PATCH v1 3/3] update_repo: correct remove routine
 
Implemented ability to remove opensuse-leap OS packages.
---
 tools/update_repo.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/update_repo.sh b/tools/update_repo.sh
index 0d39f108d..581539719 100755
--- a/tools/update_repo.sh
+++ b/tools/update_repo.sh
@@ -881,7 +881,16 @@ function remove_rpm {
     # broken update left orphan files: they are present in the
     # storage, but does not mentioned in the metadata.
     for suffix in 'x86_64' 'noarch' 'src'; do
- file="$bucket_path/$packpath/${remove}-1.${os}${option_dist}.${suffix}.rpm"
+ if [ "$os" == "opensuse-leap" ]; then
+ # Open Build Service (openSUSE) does not follow the usual
+ # approach: 'Release' is like lp152.1.1, where the first
+ # '1' is $(RELEASE) RPM spec directive value and the second
+ # '1' is the number of rebuilds.
+ os_dist="lp"`echo $option_dist | sed 's#\.##g'`".1.1"
+ else
+ os_dist="1.${os}${option_dist}"
+ fi
+ file="$bucket_path/$packpath/${remove}-${os_dist}.${suffix}.rpm"
         echo "Searching to remove: $file"
         $aws ls $file || continue
         $aws rm $file
--
2.25.1
 
 
--
Alexander Tikhonov
 
 
--------------DA62AACAB86C984E7ABB31A7--