From 8563efb9da6f91307296ada00952c87fd489f484 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Sat, 6 Nov 2021 19:18:04 -0400
Subject: [PATCH] aportupgrade: if $pkgver=9999, use $_pkgver variable instead
 (MR 2127)

fixes #2071
---
 pmb/helpers/aportupgrade.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pmb/helpers/aportupgrade.py b/pmb/helpers/aportupgrade.py
index 02e4f25a..cc78695e 100644
--- a/pmb/helpers/aportupgrade.py
+++ b/pmb/helpers/aportupgrade.py
@@ -135,7 +135,11 @@ def upgrade_git_package(args, pkgname: str, package) -> bool:
     sha_new = verinfo["sha"]
 
     # Format the new pkgver, keep the value before _git the same
-    pkgver = package["pkgver"]
+    if package["pkgver"] == "9999":
+        pkgver = package["_pkgver"]
+    else:
+        pkgver = package["pkgver"]
+
     pkgver_match = re.match(r"([\d.]+)_git", pkgver)
     date_pkgver = verinfo["date"].strftime("%Y%m%d")
     pkgver_new = f"{pkgver_match.group(1)}_git{date_pkgver}"
@@ -155,7 +159,10 @@ def upgrade_git_package(args, pkgname: str, package) -> bool:
         logging.info(f"  Would change pkgrel from {pkgrel} to {pkgrel_new}")
         return True
 
-    pmb.helpers.file.replace_apkbuild(args, pkgname, "pkgver", pkgver_new)
+    if package["pkgver"] == "9999":
+        pmb.helpers.file.replace_apkbuild(args, pkgname, "_pkgver", pkgver_new)
+    else:
+        pmb.helpers.file.replace_apkbuild(args, pkgname, "pkgver", pkgver_new)
     pmb.helpers.file.replace_apkbuild(args, pkgname, "pkgrel", pkgrel_new)
     pmb.helpers.file.replace_apkbuild(args, pkgname, "_commit", sha_new, True)
     return True
@@ -214,7 +221,11 @@ def upgrade_stable_package(args, pkgname: str, package) -> bool:
         logging.info("{}: up-to-date".format(pkgname))
         return False
 
-    pkgver = package["pkgver"]
+    if package["pkgver"] == "9999":
+        pkgver = package["_pkgver"]
+    else:
+        pkgver = package["pkgver"]
+
     pkgver_new = version
 
     pkgrel = package["pkgrel"]
@@ -231,7 +242,11 @@ def upgrade_stable_package(args, pkgname: str, package) -> bool:
         logging.info(f"  Would change pkgrel from {pkgrel} to {pkgrel_new}")
         return True
 
-    pmb.helpers.file.replace_apkbuild(args, pkgname, "pkgver", pkgver_new)
+    if package["pkgver"] == "9999":
+        pmb.helpers.file.replace_apkbuild(args, pkgname, "_pkgver", pkgver_new)
+    else:
+        pmb.helpers.file.replace_apkbuild(args, pkgname, "pkgver", pkgver_new)
+
     pmb.helpers.file.replace_apkbuild(args, pkgname, "pkgrel", pkgrel_new)
     return True