[oe-commits] org.oe.dev patch.bbclass: give empty file for quilt so it will not use config from user homedir - closes #2704 (code from Poky)

[hrw commit]

patch.bbclass: give empty file for quilt so it will not use config from user homedir - closes #2704 (code from Poky)

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

#
# mt diff -r4bbce1b1f23b34445cc85ab8c7fa08737f26602a -r4f7ef143d39b81858bfefba3a315d8285fd52634
#
# 
# 
# patch "classes/patch.bbclass"
#  from [13f060e11ac73613512bdea10a347394f120fba9]
#    to [eedc7c6dfbe33a021023d2efe764b60cca95d6da]
# 
============================================================
--- classes/patch.bbclass	13f060e11ac73613512bdea10a347394f120fba9
+++ classes/patch.bbclass	eedc7c6dfbe33a021023d2efe764b60cca95d6da
@@ -1,5 +1,8 @@
 # Copyright (C) 2006  OpenedHand LTD
 
+# Point to an empty file so any user's custom settings don't break things
+QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
+
 def patch_init(d):
 	import os, sys
 
@@ -180,9 +183,10 @@ def patch_init(d):
 
 	class QuiltTree(PatchSet):
 		def _runcmd(self, args, run = True):
+			quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1)
 			if not run:
-				return ["quilt"] + args
-			runcmd(["quilt"] + args, self.dir)
+				return ["quilt"] + ["--quiltrc"] + [quiltrc] + args
+			runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
 
 		def _quiltpatchpath(self, file):
 			return os.path.join(self.dir, "patches", os.path.basename(file))