summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-02-22 12:04:53 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:00 +0000
commit81ebb0b61ec092e974926a2bd773848d185bdde0 (patch)
tree0dbc4e79ca449933d36ce86317b4ae8055d4f768
parente953b5711fe5eae53cbb5b4fab1260bf07631f86 (diff)
downloadpoky-81ebb0b61ec092e974926a2bd773848d185bdde0.tar.gz
devtool: upgrade: fix version argument checking
For recipes that specify SRCREV, the code here wasn't quite doing the right thing. If the recipe has a SRCREV then that needs changing on upgrade, so ensure that the user specifies it. If it doesn't, then it'll be "INVALID" not None since the former is the actual default, so handle that properly as well. Additionally an unset variable was being erroneously passed when raising the error about the version being the same leading to a traceback, so fix that as well. (From OE-Core rev: 1d0f821371d1cb93e30fad86f0c20e38cb93b54b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/upgrade.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 279a65f62a..77b48f45a7 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -314,8 +314,13 @@ def upgrade(args, config, basepath, workspace):
314 srctree = standard.get_default_srctree(config, pn) 314 srctree = standard.get_default_srctree(config, pn)
315 315
316 standard._check_compatible_recipe(pn, rd) 316 standard._check_compatible_recipe(pn, rd)
317 if rd.getVar('PV', True) == args.version and rd.getVar('SRCREV', True) == args.srcrev: 317 old_srcrev = rd.getVar('SRCREV', True)
318 raise DevtoolError("Current and upgrade versions are the same version" % version) 318 if old_srcrev == 'INVALID':
319 old_srcrev = None
320 if old_srcrev and not args.srcrev:
321 raise DevtoolError("Recipe specifies a SRCREV value; you must specify a new one when upgrading")
322 if rd.getVar('PV', True) == args.version and old_srcrev == args.srcrev:
323 raise DevtoolError("Current and upgrade versions are the same version")
319 324
320 rf = None 325 rf = None
321 try: 326 try: