From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100])
 (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 2B64344643A
 for <tarantool-patches@dev.tarantool.org>;
 Sun, 25 Oct 2020 11:37:49 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Sun, 25 Oct 2020 11:37:44 +0300
Message-Id: <9c78cb64987fcf6a5687315061f4ad4748697beb.1603614713.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1603614713.git.avtikhon@tarantool.org>
References: <cover.1603614713.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH v1 3/3] update_repo: correct remove
	routine
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

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