From 26cafdad20bf2f6c7fe037500821ad8849fdd143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net>
Date: Fri, 27 Feb 2015 01:38:13 +0100
Subject: [PATCH] Prefer _pkgvere to pkgver when updating

---
 src/lib/archversion/pacman.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/lib/archversion/pacman.py b/src/lib/archversion/pacman.py
index cd65079..7e3f992 100644
--- a/src/lib/archversion/pacman.py
+++ b/src/lib/archversion/pacman.py
@@ -47,13 +47,20 @@ def parse_pkgbuild(path, shell="bash"):
 
 def pkgbuild_set_version(path, version, reset=True):
     '''
-    Change PKGBUILD pkgver to version
-    If reset is True, pkgrel will be set to 1
+    Change PKGBUILD $pkgver to version
+    if a variable $_pkgver is present, this one will be updated instead of $pkgver
+    If reset is True, $pkgrel will be set to 1
     '''
+    wspces = "[ \t\r\f\v]"
     data = open(path, "r").read()
-    data = re.sub("pkgver=.*", "pkgver=%s" % version, data)
+    # prefer to replace $_pkgver
+    var = "pkgver" if re.search("^%s*_pkgver=" % wspces, data,
+        re.MULTILINE) is None else "_pkgver"
+    data = re.sub("^(%s*%s=).*$" % (wspces, var),
+        "\g<1>%s" % version, data, flags=re.MULTILINE)
     if reset:
-        data = re.sub("pkgrel=.*", "pkgrel=1", data)
+        data = re.sub("^(%s*pkgrel=).*" % wspces, "\g<1>1", data,
+            flags=re.MULTILINE)
     open(path, "w").write(data)
 
 def pkgbuild_update_checksums(path):
-- 
GitLab