summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-03 13:07:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:52 +0000
commitf35ce02c5ddbad10376f43b5b1dafc8153a303a2 (patch)
tree030eeb39148d19a47949ce8abdc0646a78ac8652
parentbd73fa69f532ca3d81ec2452a79e7a333b3543c2 (diff)
downloadpoky-f35ce02c5ddbad10376f43b5b1dafc8153a303a2.tar.gz
buildhistory: Allow the version backwards check to be disabled
When the PR service is not enabled, the versions can go backwards and there are cases we don't want to know about this. This patch adds a variable allowing these checks to be turned off whilst still using buildhistory. (From OE-Core rev: 49f33a42e93711c96fbb099f3e6ee7f092d7b356) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/buildhistory.bbclass18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index a20d03dae7..43780ad2da 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -14,6 +14,7 @@ BUILDHISTORY_DIR_PACKAGE = "${BUILDHISTORY_DIR}/packages/${MULTIMACH_TARGET_SYS}
14BUILDHISTORY_COMMIT ?= "0" 14BUILDHISTORY_COMMIT ?= "0"
15BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>" 15BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>"
16BUILDHISTORY_PUSH_REPO ?= "" 16BUILDHISTORY_PUSH_REPO ?= ""
17BUILDHISTORY_CHECKVERBACKWARDS ?= "1"
17 18
18# Must inherit package first before changing PACKAGEFUNCS 19# Must inherit package first before changing PACKAGEFUNCS
19inherit package 20inherit package
@@ -183,14 +184,15 @@ python buildhistory_emit_pkghistory() {
183 # Find out what the last version was 184 # Find out what the last version was
184 # Make sure the version did not decrease 185 # Make sure the version did not decrease
185 # 186 #
186 lastversion = getlastpkgversion(pkg) 187 if d.getVar("BUILDHISTORY_CHECKVERBACKWARDS", True) == "1":
187 if lastversion: 188 lastversion = getlastpkgversion(pkg)
188 last_pkge = lastversion.pkge 189 if lastversion:
189 last_pkgv = lastversion.pkgv 190 last_pkge = lastversion.pkge
190 last_pkgr = lastversion.pkgr 191 last_pkgv = lastversion.pkgv
191 r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr)) 192 last_pkgr = lastversion.pkgr
192 if r < 0: 193 r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr))
193 bb.error("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)) 194 if r < 0:
195 bb.error("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))
194 196
195 pkginfo = PackageInfo(pkg) 197 pkginfo = PackageInfo(pkg)
196 # Apparently the version can be different on a per-package basis (see Python) 198 # Apparently the version can be different on a per-package basis (see Python)