aboutsummaryrefslogtreecommitdiffstats
path: root/lib/oe
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-10-21 17:21:53 -0700
committerChris Larson <chris_larson@mentor.com>2010-10-21 18:52:05 -0700
commit7e4958f03ee2a76da2b86b913cdcb5c0ca21ce8b (patch)
tree10dc255171e3ffb5b64eee25eb83f90feacfee33 /lib/oe
parent18690b2e5a56f10697bd594555f7baff16637e0e (diff)
downloadopenembedded-7e4958f03ee2a76da2b86b913cdcb5c0ca21ce8b.tar.gz
openembedded-7e4958f03ee2a76da2b86b913cdcb5c0ca21ce8b.tar.bz2
openembedded-7e4958f03ee2a76da2b86b913cdcb5c0ca21ce8b.zip
oe.patch: fix 'd' references
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib/oe')
-rw-r--r--lib/oe/patch.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/oe/patch.py b/lib/oe/patch.py
index 05abccfc1c..8be8c892ea 100644
--- a/lib/oe/patch.py
+++ b/lib/oe/patch.py
@@ -350,7 +350,7 @@ class UserResolver(Resolver):
# Patch application failed
patchcmd = self.patchset.Push(True, False, False)
- t = bb.data.getVar('T', d, 1)
+ t = bb.data.getVar('T', self.patchset.d, 1)
if not t:
bb.msg.fatal(bb.msg.domain.Build, "T not set")
bb.mkdirhier(t)
@@ -362,16 +362,16 @@ class UserResolver(Resolver):
f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n")
f.write("echo ''\n")
f.write(" ".join(patchcmd) + "\n")
- f.write("#" + bb.data.getVar('TERMCMDRUN', d, 1))
+ f.write("#" + bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
f.close()
os.chmod(rcfile, 0775)
os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
os.environ['TERMRCFILE'] = rcfile
- rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1))
+ rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
- + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', d, 1))
+ + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
# Construct a new PatchSet after the user's changes, compare the
# sets, checking patches for modifications, and doing a remote