summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/devtool/standard.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 893226578a..0142fe0d62 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -427,12 +427,6 @@ def update_recipe(args, config, basepath, workspace):
427 logger.error("no recipe named %s in your workspace" % args.recipename) 427 logger.error("no recipe named %s in your workspace" % args.recipename)
428 return -1 428 return -1
429 429
430 # Get initial revision from bbappend
431 appends = glob.glob(os.path.join(config.workspace_path, 'appends', '%s_*.bbappend' % args.recipename))
432 if not appends:
433 logger.error('unable to find workspace bbappend for recipe %s' % args.recipename)
434 return -1
435
436 tinfoil = setup_tinfoil() 430 tinfoil = setup_tinfoil()
437 import bb 431 import bb
438 from oe.patch import GitApplyTree 432 from oe.patch import GitApplyTree
@@ -443,6 +437,12 @@ def update_recipe(args, config, basepath, workspace):
443 return -1 437 return -1
444 recipefile = rd.getVar('FILE', True) 438 recipefile = rd.getVar('FILE', True)
445 439
440 # Get initial revision from bbappend
441 append = os.path.join(config.workspace_path, 'appends', '%s.bbappend' % os.path.splitext(os.path.basename(recipefile))[0])
442 if not os.path.exists(append):
443 logger.error('unable to find workspace bbappend for recipe %s' % args.recipename)
444 return -1
445
446 orig_src_uri = rd.getVar('SRC_URI', False) or '' 446 orig_src_uri = rd.getVar('SRC_URI', False) or ''
447 if args.mode == 'auto': 447 if args.mode == 'auto':
448 if 'git://' in orig_src_uri: 448 if 'git://' in orig_src_uri:
@@ -513,7 +513,7 @@ def update_recipe(args, config, basepath, workspace):
513 initial_rev = args.initial_rev 513 initial_rev = args.initial_rev
514 else: 514 else:
515 initial_rev = None 515 initial_rev = None
516 with open(appends[0], 'r') as f: 516 with open(append, 'r') as f:
517 for line in f: 517 for line in f:
518 if line.startswith('# initial_rev:'): 518 if line.startswith('# initial_rev:'):
519 initial_rev = line.split(':')[-1].strip() 519 initial_rev = line.split(':')[-1].strip()