[oe-commits] Chris Larson : oe.patch: fix 'd' references
git version control
git at git.openembedded.org
Fri Oct 22 02:41:02 UTC 2010
Module: openembedded.git
Branch: darwin
Commit: 7e4958f03ee2a76da2b86b913cdcb5c0ca21ce8b
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7e4958f03ee2a76da2b86b913cdcb5c0ca21ce8b
Author: Chris Larson <chris_larson at mentor.com>
Date: Thu Oct 21 17:21:53 2010 -0700
oe.patch: fix 'd' references
Signed-off-by: Chris Larson <chris_larson at mentor.com>
---
lib/oe/patch.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/oe/patch.py b/lib/oe/patch.py
index 05abccf..8be8c89 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
More information about the Openembedded-commits
mailing list