diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-09-05 19:46:22 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-09-05 19:46:22 +0000 |
| commit | f531b00978588b908d569abc4c977b69923e6b7c (patch) | |
| tree | 7b6f2236bbf4013a046c7fb0a695b9a88c0b2af9 | |
| parent | 5688ae31a366518bcfe63c24480a9db3e052aee5 (diff) | |
| parent | 6713b5b6ec1da1d618fabe0cb234d7cb32d2a6ba (diff) | |
merge of 20b7bbea275e7ecd24b4823a8ce94e3a8df944a9
and c2e09eb237e0886af84ee5fd3c3b201c4cec5550
| -rw-r--r-- | classes/patch.bbclass | 10 |
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) |