[oe-commits] org.oe.dev patch.bbclass: Fix errors when reapplying patches

[rpurdie commit]

patch.bbclass: Fix errors when reapplying patches

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: f55d909c7d672f29596e7a18eeaabfc0a7b63d30
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f55d909c7d672f29596e7a18eeaabfc0a7b63d30
Files:
1
classes/patch.bbclass
Diffs:

#
# mt diff -r60c4b1f7bb0a51872ac48001aaf05eb05ca8a11f -rf55d909c7d672f29596e7a18eeaabfc0a7b63d30
#
# 
# 
# patch "classes/patch.bbclass"
#  from [01233de74e5b7f50137574599e0cca158721e888]
#    to [e2224211341bed82184504c229e87898c5519d9b]
# 
============================================================
--- classes/patch.bbclass	01233de74e5b7f50137574599e0cca158721e888
+++ classes/patch.bbclass	e2224211341bed82184504c229e87898c5519d9b
@@ -38,7 +38,7 @@ def patch_init(d):
 			if not os.path.exists(dir):
 				raise NotFoundError(dir)
 			os.chdir(dir)
-			# print("cwd: %s -> %s" % (olddir, self.dir))
+			# print("cwd: %s -> %s" % (olddir, dir))
 
 		try:
 			args = [ commands.mkarg(str(arg)) for arg in args ]
@@ -231,6 +231,7 @@ def patch_init(d):
 			args = ["import", "-p", patch["strippath"]]
 			if force:
 				args.append("-f")
+				args.append("-dn")
 			args.append(patch["file"])
 
 			self._runcmd(args)