| Message ID | 1573089163-24874-1-git-send-email-denis@denix.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | buildhistory: fix "version went backwards" QA error message | expand |
On Wed, 2019-11-06 at 20:12 -0500, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@ti.com> > > 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) > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> I did really appreciate that you fixed the test in the commit, however the autobuilder disagrees: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/470 :/. Cheers, Richard -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index f986f7c..affdf27 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -280,7 +280,7 @@ python buildhistory_emit_pkghistory() { last_pkgr = lastversion.pkgr r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr)) if r < 0: - 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) + 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) package_qa_handle_error("version-going-backwards", msg, d) pkginfo = PackageInfo(pkg) diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py index 6a5378d..c07b050 100644 --- a/meta/lib/oeqa/selftest/cases/buildoptions.py +++ b/meta/lib/oeqa/selftest/cases/buildoptions.py @@ -143,7 +143,7 @@ class BuildhistoryTests(BuildhistoryBase): def test_buildhistory_buildtime_pr_backwards(self): target = 'xcursor-transparent-theme' - error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds from (.*-r1.* to .*-r0.*)" % target + error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds (from .*-r1.* to .*-r0.*)" % target self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error)