aportupgrade: if $pkgver=9999, use $_pkgver variable instead (MR 2127)
fixes #2071
This commit is contained in:
parent
54fade131c
commit
8563efb9da
|
@ -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
|
||||
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,6 +159,9 @@ def upgrade_git_package(args, pkgname: str, package) -> bool:
|
|||
logging.info(f" Would change pkgrel from {pkgrel} to {pkgrel_new}")
|
||||
return True
|
||||
|
||||
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)
|
||||
|
@ -214,7 +221,11 @@ def upgrade_stable_package(args, pkgname: str, package) -> bool:
|
|||
logging.info("{}: up-to-date".format(pkgname))
|
||||
return False
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue