diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 6d7fd17fbd..7972b4f822 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -937,14 +937,13 @@ def modify(args, config, basepath, workspace): | |||
937 | seen_patches = [] | 937 | seen_patches = [] |
938 | for branch in branches: | 938 | for branch in branches: |
939 | branch_patches[branch] = [] | 939 | branch_patches[branch] = [] |
940 | (stdout, _) = bb.process.run('git log devtool-base..%s' % branch, cwd=srctree) | 940 | (stdout, _) = bb.process.run('git rev-list devtool-base..%s' % branch, cwd=srctree) |
941 | for line in stdout.splitlines(): | 941 | for sha1 in stdout.splitlines(): |
942 | line = line.strip() | 942 | notes = oe.patch.GitApplyTree.getNotes(srctree, sha1.strip()) |
943 | if line.startswith(oe.patch.GitApplyTree.patch_line_prefix): | 943 | origpatch = notes.get(oe.patch.GitApplyTree.original_patch) |
944 | origpatch = line[len(oe.patch.GitApplyTree.patch_line_prefix):].split(':', 1)[-1].strip() | 944 | if origpatch and origpatch not in seen_patches: |
945 | if not origpatch in seen_patches: | 945 | seen_patches.append(origpatch) |
946 | seen_patches.append(origpatch) | 946 | branch_patches[branch].append(origpatch) |
947 | branch_patches[branch].append(origpatch) | ||
948 | 947 | ||
949 | # Need to grab this here in case the source is within a subdirectory | 948 | # Need to grab this here in case the source is within a subdirectory |
950 | srctreebase = srctree | 949 | srctreebase = srctree |