Fix the patch.bbclass error handling in a couple of the error paths by changing the semantics of the PatchError exception.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@627 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 3 insertions, 4 deletions

diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index aa54d9b32f..6f6dc0e30e 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -52,12 +52,11 @@ def patch_init():
                                 os.chdir(olddir)
         
         class PatchError(Exception):
-                def __init__(self, patch, msg):
+                def __init__(self, msg):
                         self.msg = msg
-                        self.patch = patch
         
                 def __str__(self):
-                        return "Patch Error: patch %s: %s" % (os.path.basename(self.patch.file), self.msg)
+                        return "Patch Error: %s" % self.msg
         
         import bb, bb.data, bb.fetch
         
@@ -231,7 +230,7 @@ def patch_init():
         
                                         shutil.copyfile(patch["quiltfile"], patch["file"])
                                 else:
-                                        raise PatchError(patch, "Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
+                                        raise PatchError("Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
                         else:
                                 # quilt refresh
                                 args = ["refresh"]