From 85c188118762aaf5ce2b48da648f39840fe84d98 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 20 May 2026 22:13:49 +0200 Subject: [PATCH 1/2] Do not merge: force rebuild hashed packages --- cmsBuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmsBuild b/cmsBuild index 9321761..6709d33 100755 --- a/cmsBuild +++ b/cmsBuild @@ -2632,6 +2632,9 @@ class Package(object): if self.buildOptions: checksumCalculator.addStrings(self.buildOptions) + if self.versionSuffix and (self.options.tag == "hash"): + checksumCalculator.addString("force rebuild test1") + if self.name in self.options.forceBuild: checksumCalculator.addStrings("ForceBuild: %s" % time()) From 4c616560ca9565b361e9e41a1dcca4bdd6b85fdb Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 17 Jun 2026 14:59:19 +0200 Subject: [PATCH 2/2] Change checksum string for version suffix condition --- cmsBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmsBuild b/cmsBuild index 6709d33..ad96297 100755 --- a/cmsBuild +++ b/cmsBuild @@ -2633,7 +2633,7 @@ class Package(object): checksumCalculator.addStrings(self.buildOptions) if self.versionSuffix and (self.options.tag == "hash"): - checksumCalculator.addString("force rebuild test1") + checksumCalculator.addString("force rebuild test2") if self.name in self.options.forceBuild: checksumCalculator.addStrings("ForceBuild: %s" % time())