summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/upgrade.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/devtool/upgrade.py')
-rw-r--r--scripts/lib/devtool/upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index d9aca6e2db..dda0a58098 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -280,7 +280,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
280 # note is still attached to the old commit. Avoid this by making 280 # note is still attached to the old commit. Avoid this by making
281 # sure all old devtool related commits have a note attached to them 281 # sure all old devtool related commits have a note attached to them
282 # (this assumes git config notes.rewriteMode is set to ignore). 282 # (this assumes git config notes.rewriteMode is set to ignore).
283 (stdout, _) = __run('git rev-list devtool-base..%s' % target_branch) 283 (stdout, _) = _run('git rev-list devtool-base..%s' % target_branch, cwd=path)
284 for rev in stdout.splitlines(): 284 for rev in stdout.splitlines():
285 if not oe.patch.GitApplyTree.getNotes(path, rev): 285 if not oe.patch.GitApplyTree.getNotes(path, rev):
286 oe.patch.GitApplyTree.addNote(path, rev, "dummy") 286 oe.patch.GitApplyTree.addNote(path, rev, "dummy")
@@ -298,7 +298,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
298 logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) 298 logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
299 299
300 # Remove any dummy notes added above. 300 # Remove any dummy notes added above.
301 (stdout, _) = __run('git rev-list devtool-base..%s' % target_branch) 301 (stdout, _) = _run('git rev-list devtool-base..%s' % target_branch, cwd=path)
302 for rev in stdout.splitlines(): 302 for rev in stdout.splitlines():
303 oe.patch.GitApplyTree.removeNote(path, rev, "dummy") 303 oe.patch.GitApplyTree.removeNote(path, rev, "dummy")
304 304