summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2019-11-08 15:59:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-14 13:20:59 +0000
commitd71fb563c182f241511fe968405375fdac93611f (patch)
tree739fca6624cf60dd727e9fce5ea9ac337e2b0a3d /meta
parent41647c59170272a7b8f69a048f752d0076e777e3 (diff)
downloadpoky-d71fb563c182f241511fe968405375fdac93611f.tar.gz
buildhistory: fix "version went backwards" QA error message
Fix parentheses placement in the message from: Package version for package X went backwards which would break package feeds from (Y to Z) to this one: Package version for package X went backwards which would break package feeds (from Y to Z) (From OE-Core rev: 3a5a61fb6b3f811bd4f7232ba902afcfd2019154) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass2
-rw-r--r--meta/lib/oeqa/selftest/cases/buildoptions.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index f986f7c794..affdf272d7 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -280,7 +280,7 @@ python buildhistory_emit_pkghistory() {
280 last_pkgr = lastversion.pkgr 280 last_pkgr = lastversion.pkgr
281 r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr)) 281 r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr))
282 if r < 0: 282 if r < 0:
283 msg = "Package version for package %s went backwards which would break package feeds from (%s:%s-%s to %s:%s-%s)" % (pkg, last_pkge, last_pkgv, last_pkgr, pkge, pkgv, pkgr) 283 msg = "Package version for package %s went backwards which would break package feeds (from %s:%s-%s to %s:%s-%s)" % (pkg, last_pkge, last_pkgv, last_pkgr, pkge, pkgv, pkgr)
284 package_qa_handle_error("version-going-backwards", msg, d) 284 package_qa_handle_error("version-going-backwards", msg, d)
285 285
286 pkginfo = PackageInfo(pkg) 286 pkginfo = PackageInfo(pkg)
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 6a5378d3ff..e91f0bd18f 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -143,7 +143,7 @@ class BuildhistoryTests(BuildhistoryBase):
143 143
144 def test_buildhistory_buildtime_pr_backwards(self): 144 def test_buildhistory_buildtime_pr_backwards(self):
145 target = 'xcursor-transparent-theme' 145 target = 'xcursor-transparent-theme'
146 error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds from (.*-r1.* to .*-r0.*)" % target 146 error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds \(from .*-r1.* to .*-r0.*\)" % target
147 self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) 147 self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True)
148 self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error) 148 self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error)
149 149