summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/devtool/standard.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index a45ad36812..b7d4d47dfc 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -774,9 +774,13 @@ def modify(args, config, basepath, workspace):
774 check_commits = True 774 check_commits = True
775 else: 775 else:
776 if os.path.exists(os.path.join(srctree, '.git')): 776 if os.path.exists(os.path.join(srctree, '.git')):
777 # Check if it's a tree previously extracted by us 777 # Check if it's a tree previously extracted by us. This is done
778 # by ensuring that devtool-base and args.branch (devtool) exist.
779 # The check_commits logic will cause an exception if either one
780 # of these doesn't exist
778 try: 781 try:
779 (stdout, _) = bb.process.run('git branch --contains devtool-base', cwd=srctree) 782 (stdout, _) = bb.process.run('git branch --contains devtool-base', cwd=srctree)
783 bb.process.run('git rev-parse %s' % args.branch, cwd=srctree)
780 except bb.process.ExecutionError: 784 except bb.process.ExecutionError:
781 stdout = '' 785 stdout = ''
782 if stdout: 786 if stdout: