summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-10-25 18:19:39 +0000
committerChris Larson <kergoth@openedhand.com>2006-10-25 18:19:39 +0000
commit002f491523ed778f756367e5f27e13eac7c6fd6a (patch)
tree78f2894a9f624be531bd48a37b91c3ad3b303bd3 /meta
parent77213cacd276c9ac69daa9ce14307ebf539f5351 (diff)
downloadpoky-002f491523ed778f756367e5f27e13eac7c6fd6a.tar.gz
patch.bbclass: fix bug where it failed to detect that the user did not modify the patches at all, add note about pressing ctrl+d to exit the resolver shell.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@822 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/patch.bbclass9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 0989407844..1bd99354b5 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -345,6 +345,7 @@ def patch_init(d):
345 return 345 return
346 print(sys.exc_value) 346 print(sys.exc_value)
347 print('NOTE: dropping user into a shell, so that patch rejects can be fixed manually.') 347 print('NOTE: dropping user into a shell, so that patch rejects can be fixed manually.')
348 print('Press CTRL+D to exit.')
348 349
349 os.system('/bin/sh') 350 os.system('/bin/sh')
350 351
@@ -353,6 +354,7 @@ def patch_init(d):
353 # refresh on each. 354 # refresh on each.
354 oldpatchset = self.patchset 355 oldpatchset = self.patchset
355 self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d) 356 self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d)
357 self.patchset.InitFromDir()
356 358
357 for patch in self.patchset.patches: 359 for patch in self.patchset.patches:
358 oldpatch = None 360 oldpatch = None
@@ -384,6 +386,7 @@ def patch_init(d):
384 g["NOOPResolver"] = NOOPResolver 386 g["NOOPResolver"] = NOOPResolver
385 g["NotFoundError"] = NotFoundError 387 g["NotFoundError"] = NotFoundError
386 g["CmdError"] = CmdError 388 g["CmdError"] = CmdError
389 g["PatchError"] = PatchError
387 390
388addtask patch after do_unpack 391addtask patch after do_unpack
389do_patch[dirs] = "${WORKDIR}" 392do_patch[dirs] = "${WORKDIR}"
@@ -482,7 +485,11 @@ python patch_do_patch() {
482 except NotFoundError: 485 except NotFoundError:
483 import sys 486 import sys
484 raise bb.build.FuncFailed(str(sys.exc_value)) 487 raise bb.build.FuncFailed(str(sys.exc_value))
485 resolver.Resolve() 488 try:
489 resolver.Resolve()
490 except PatchError:
491 import sys
492 raise bb.build.FuncFailed(str(sys.exc_value))
486} 493}
487 494
488EXPORT_FUNCTIONS do_patch 495EXPORT_FUNCTIONS do_patch