From patchwork Fri Nov 8 20:59:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 178961 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3269416ilf; Fri, 8 Nov 2019 12:59:38 -0800 (PST) X-Google-Smtp-Source: APXvYqzOKn5UsO3i7O/GpALjxUWIS2XVntfCfKM5subGIlX6faiF5OyDskBuehica3XhdlVjoYGj X-Received: by 2002:a62:b616:: with SMTP id j22mr13875059pff.201.1573246777966; Fri, 08 Nov 2019 12:59:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573246777; cv=none; d=google.com; s=arc-20160816; b=cnXEDt/SxiUvy9mpXAyLhDAnZ24bi7cdJA0gFjgMppUyg4aTuzSBHsxJlRdM1bAWSE 8P5kB93PfnKHASttkyj/Y66zqu/D9gfGXoVuMbOGcEkVcA5VkRFKSpdJI6+cTg2GHWqB +ykliSjCJHVh9KHtXpSBHB6zJauGODWwMCZqG4ev2iBbF2cu1/WJDAevJBGY1wdtbjC2 jJPzo76wuL5d5zT/IIhBSeXsh47ys9tqlQiQOFLk38SLEknE34v46B8dJsvgXjMHMMz7 1jIUtSPEKW/pWCveMwc585FuoeLQ2jXvgcCPrkvSUoFDPdRHikG4Glqi8JW5xgqla1IS /Lqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; bh=hn3y9QPKvjvLU881PxXuv2VIRrTQPycpHlVlaAlTvyY=; b=Fab7ibZWuo3V+Q4sctyS+sijjMPoxKdRdRzn48kMv+SprKEOc8bTpPaUNPriWGbxM+ 6f971aBmm0BMCPWx3WzYQMQndEohaGeQYNe1oqrnhDX5eRIbvmO3h7ZkKIwVEJ8JIyNB ic1K1GwdUWWqiXcjSeJ0L+AtRVfDPIrWHkpwtbD0Y2z/WkPM3t1ztQXWmEZ+lWw34QlC vCNA7y1X6XNov/r6KfLWxhSQsu/Xphj2LmKsJ/8agNaC9Yt4HiO+dPz6MeSi5VUX6nJg rzRTi4dRQ+NmjDHgkdAMoKEFd1yHIBa1N9vUHvbZDz6gCn4FhzVnp4iB0bsu98PxUVSp 7Buw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b8si7511561pjo.48.2019.11.08.12.59.37; Fri, 08 Nov 2019 12:59:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8D4F37FCA5; Fri, 8 Nov 2019 20:59:34 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mail.openembedded.org (Postfix) with ESMTP id 7D9457FC9D for ; Fri, 8 Nov 2019 20:59:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 9AD0940BFF; Fri, 8 Nov 2019 20:59:33 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KztD6LGn3C9m; Fri, 8 Nov 2019 20:59:33 +0000 (UTC) Received: from mail.denix.org (pool-100-15-86-127.washdc.fios.verizon.net [100.15.86.127]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 85E8D40BEA; Fri, 8 Nov 2019 20:59:32 +0000 (UTC) Received: from gimli.denix (unknown [192.168.30.6]) by mail.denix.org (Postfix) with ESMTP id 31DAE170443; Fri, 8 Nov 2019 15:59:32 -0500 (EST) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Fri, 8 Nov 2019 15:59:29 -0500 Message-Id: <1573246769-12052-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH v2] buildhistory: fix "version went backwards" QA error message X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Denys Dmytriyenko 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 --- v2 - escape parentheses in the regular expression of the selftest case, as those are part of the text and not regex itself, otherwise it won't match. meta/classes/buildhistory.bbclass | 2 +- meta/lib/oeqa/selftest/cases/buildoptions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 -- _______________________________________________ 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..e91f0bd 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)