summaryrefslogtreecommitdiff
path: root/meta/classes/patch.bbclass
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/classes/patch.bbclass
parent77213cacd276c9ac69daa9ce14307ebf539f5351 (diff)
downloadopenembedded-core-002f491523ed778f756367e5f27e13eac7c6fd6a.tar.gz
openembedded-core-002f491523ed778f756367e5f27e13eac7c6fd6a.tar.bz2
openembedded-core-002f491523ed778f756367e5f27e13eac7c6fd6a.tar.xz
openembedded-core-002f491523ed778f756367e5f27e13eac7c6fd6a.zip
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/classes/patch.bbclass')
-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 098940784..1bd99354b 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -345,6 +345,7 @@ def patch_init(d):
return
print(sys.exc_value)
print('NOTE: dropping user into a shell, so that patch rejects can be fixed manually.')
+ print('Press CTRL+D to exit.')
os.system('/bin/sh')
@@ -353,6 +354,7 @@ def patch_init(d):
# refresh on each.
oldpatchset = self.patchset
self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d)
+ self.patchset.InitFromDir()
for patch in self.patchset.patches:
oldpatch = None
@@ -384,6 +386,7 @@ def patch_init(d):
g["NOOPResolver"] = NOOPResolver
g["NotFoundError"] = NotFoundError
g["CmdError"] = CmdError
+ g["PatchError"] = PatchError
addtask patch after do_unpack
do_patch[dirs] = "${WORKDIR}"
@@ -482,7 +485,11 @@ python patch_do_patch() {
except NotFoundError:
import sys
raise bb.build.FuncFailed(str(sys.exc_value))
- resolver.Resolve()
+ try:
+ resolver.Resolve()
+ except PatchError:
+ import sys
+ raise bb.build.FuncFailed(str(sys.exc_value))
}
EXPORT_FUNCTIONS do_patch