summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-05-27 15:58:00 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-05-27 15:58:00 +0100
commit1de1ac2eb21ccb393507f6c950d8254e601c16b9 (patch)
tree21559e2fdae7310c942b3066e84ea1edfe1ab239 /meta
parentd630317b6b297ba6567cc2e3914706dda0690245 (diff)
downloadopenembedded-core-1de1ac2eb21ccb393507f6c950d8254e601c16b9.tar.gz
openembedded-core-1de1ac2eb21ccb393507f6c950d8254e601c16b9.tar.bz2
openembedded-core-1de1ac2eb21ccb393507f6c950d8254e601c16b9.zip
lib/oe/patch.py: Fix datastore references in error paths
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/patch.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 54c12bac2a..c1d616e668 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -356,7 +356,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)
@@ -368,16 +368,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