[oe-commits] org.oe.dev patch.bbclass: Fix bug in PatchTree.Import resulting in new patches being imported -before- the current patch rather than -after-.

[clarson commit]

patch.bbclass: Fix bug in PatchTree.Import resulting in new patches being imported -before- the current patch rather than -after-.

Author: clarson at kergoth.com
Branch: org.openembedded.dev
Revision: 0c337b44505c67c07084efda2b6f15a785d4ee46
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c337b44505c67c07084efda2b6f15a785d4ee46
Files:
1
classes/patch.bbclass
Diffs:

#
# mt diff -r7e16c38efab413bbc5aae462f2ccd44bc020978e -r0c337b44505c67c07084efda2b6f15a785d4ee46
#
# 
# 
# patch "classes/patch.bbclass"
#  from [2382aef08c4d26415d3a3a8237dd9829449a387c]
#    to [01233de74e5b7f50137574599e0cca158721e888]
# 
============================================================
--- classes/patch.bbclass	2382aef08c4d26415d3a3a8237dd9829449a387c
+++ classes/patch.bbclass	01233de74e5b7f50137574599e0cca158721e888
@@ -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)