summaryrefslogtreecommitdiff
path: root/classes/patch.bbclass
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2006-09-05 19:23:39 +0000
committerChris Larson <clarson@kergoth.com>2006-09-05 19:23:39 +0000
commitdf4ea569ef7a9c2b0498fa924280acbd580de94a (patch)
tree4344d449909db8b41cd1b7adcbd3695c84fb085d /classes/patch.bbclass
parent331ec17a16ea8be41fe2a0e5c4fa272b568f319b (diff)
patch.bbclass: Fix bug in PatchTree.Import resulting in new patches being imported -before- the current patch rather than -after-.
Diffstat (limited to 'classes/patch.bbclass')
-rw-r--r--classes/patch.bbclass10
1 files changed, 9 insertions, 1 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index f0232adf1e..e3b89ba4f9 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -117,7 +117,11 @@ def patch_init(d):
""""""
PatchSet.Import(self, patch, force)
- self.patches.insert(self._current or 0, patch)
+ if self._current is not None:
+ i = self._current + 1
+ else:
+ i = 0
+ self.patches.insert(i, patch)
def _applypatch(self, patch, force = None, reverse = None):
shellcmd = ["cat", patch['file'], "|", "patch", "-p", patch['strippath']]
@@ -137,18 +141,22 @@ def patch_init(d):
return output
def Push(self, force = None, all = None):
+ bb.note("self._current is %s" % self._current)
+ bb.note("patches is %s" % self.patches)
if all:
for i in self.patches:
if self._current is not None:
self._current = self._current + 1
else:
self._current = 0
+ bb.note("applying patch %s" % i)
self._applypatch(i, force)
else:
if self._current is not None:
self._current = self._current + 1
else:
self._current = 0
+ bb.note("applying patch %s" % self.patches[self._current])
self._applypatch(self.patches[self._current], force)