[pacman-dev] [PATCH] repo-add: should have option to prevent downgrading

[ekardnam]

Hello,

following this report #FS17752 (link at [0]) I made a patch to repo-add

From 972a5e88df392042d60e5aea1e52e8c5dd113a69 Mon Sep 17 00:00:00 2001
From: ekardnam <lucabertozzi.pub at gmail.com>
Date: Tue, 26 Mar 2019 21:28:39 +0000
Subject: [PATCH] Added --dont-downgrade flag to repo-add as stated in issue
 #17752

---
 scripts/repo-add.sh.in | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 57413df5..f8748f08 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -42,6 +42,7 @@ REPO_DB_SUFFIX=
 LOCKFILE=
 CLEAN_LOCK=0
 USE_COLOR='y'
+DONT_DOWNGRADE=0
 
 # Import libmakepkg
 source "$LIBRARY"/util/message.sh
@@ -63,6 +64,7 @@ Multiple packages to add can be specified on the command line.\n")"
         printf -- "$(gettext "Options:\n")"
         printf -- "$(gettext "  -n, --new         only add packages that are not already in the database\n")"
         printf -- "$(gettext "  -R, --remove      remove old package file from disk after updating database\n")"
+        printf -- "$(gettext "  --dont-downgrade  do not add package to database if a newer version is already present\n")"
     elif [[ $cmd == "repo-remove" ]] ; then
         printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename> ...\n")"
         printf -- "\n"
@@ -248,9 +250,17 @@ db_write_entry() {
             return 0
         fi
     else
-        if (( RMEXISTING )); then
-            pkgentry=$(find_pkgentry "$pkgname")
-            if [[ -n $pkgentry ]]; then
+        pkgentry=$(find_pkgentry "$pkgname")
+        if [[ -n $pkgentry ]]; then
+            
+            local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc")
+            if (( "$(vercmp $version $pkgver)" > "0" )); then
+                warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname"
+                if (( DONT_DOWNGRADE )); then
+                    return 0
+                fi
+            fi
+            if (( RMEXISTING )); then
                 local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")"
                 local oldfile="$(dirname "$1")/$oldfilename"
             fi
@@ -618,6 +628,9 @@ while (( $# )); do
         -v|--verify)
             VERIFY=1
             ;;
+        --dont-downgrade)
+            DONT_DOWNGRADE=1
+            ;;
         *)
             args+=("$1")
             ;;
-- 
2.19.2


----------Links and stuff---------------

[0] https://bugs.archlinux.org/task/17752?project=3

ekardnam

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20190428/79456b78/attachment.sig>