summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/devtool/standard.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 32fb3b656b..f9369eeef0 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -326,8 +326,19 @@ def modify(args, config, basepath, workspace):
326 commits = stdout.split() 326 commits = stdout.split()
327 else: 327 else:
328 if os.path.exists(os.path.join(args.srctree, '.git')): 328 if os.path.exists(os.path.join(args.srctree, '.git')):
329 (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=args.srctree) 329 # Check if it's a tree previously extracted by us
330 initial_rev = stdout.rstrip() 330 try:
331 (stdout, _) = bb.process.run('git branch --contains devtool-base', cwd=args.srctree)
332 except bb.process.ExecutionError:
333 stdout = ''
334 for line in stdout.splitlines():
335 if line.startswith('*'):
336 (stdout, _) = bb.process.run('git rev-parse devtool-base', cwd=args.srctree)
337 initial_rev = stdout.rstrip()
338 if not initial_rev:
339 # Otherwise, just grab the head revision
340 (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=args.srctree)
341 initial_rev = stdout.rstrip()
331 342
332 # Check that recipe isn't using a shared workdir 343 # Check that recipe isn't using a shared workdir
333 s = rd.getVar('S', True) 344 s = rd.getVar('S', True)