summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-05-27 14:58:00 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-05-27 14:58:00 (GMT)
commit1de1ac2eb21ccb393507f6c950d8254e601c16b9 (patch)
tree21559e2fdae7310c942b3066e84ea1edfe1ab239 /meta/lib
parentd630317b6b297ba6567cc2e3914706dda0690245 (diff)
downloadpoky-1de1ac2eb21ccb393507f6c950d8254e601c16b9.tar.gz
lib/oe/patch.py: Fix datastore references in error paths
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/lib')
-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 54c12ba..c1d616e 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -356,7 +356,7 @@ class UserResolver(Resolver):
356 # Patch application failed 356 # Patch application failed
357 patchcmd = self.patchset.Push(True, False, False) 357 patchcmd = self.patchset.Push(True, False, False)
358 358
359 t = bb.data.getVar('T', d, 1) 359 t = bb.data.getVar('T', self.patchset.d, 1)
360 if not t: 360 if not t:
361 bb.msg.fatal(bb.msg.domain.Build, "T not set") 361 bb.msg.fatal(bb.msg.domain.Build, "T not set")
362 bb.mkdirhier(t) 362 bb.mkdirhier(t)
@@ -368,16 +368,16 @@ class UserResolver(Resolver):
368 f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n") 368 f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n")
369 f.write("echo ''\n") 369 f.write("echo ''\n")
370 f.write(" ".join(patchcmd) + "\n") 370 f.write(" ".join(patchcmd) + "\n")
371 f.write("#" + bb.data.getVar('TERMCMDRUN', d, 1)) 371 f.write("#" + bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
372 f.close() 372 f.close()
373 os.chmod(rcfile, 0775) 373 os.chmod(rcfile, 0775)
374 374
375 os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" 375 os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
376 os.environ['TERMRCFILE'] = rcfile 376 os.environ['TERMRCFILE'] = rcfile
377 rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1)) 377 rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
378 if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: 378 if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
379 bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ 379 bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
380 + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', d, 1)) 380 + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
381 381
382 # Construct a new PatchSet after the user's changes, compare the 382 # Construct a new PatchSet after the user's changes, compare the
383 # sets, checking patches for modifications, and doing a remote 383 # sets, checking patches for modifications, and doing a remote