summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-08-23 08:50:26 +0000
committerChris Larson <kergoth@openedhand.com>2006-08-23 08:50:26 +0000
commit056b43353e87340e5262c61d229b668a788314ca (patch)
tree3d0d6d0ed3d164da2c9120710736984e356e38d6
parentc69404a7d57f922c437b783ff3dcdf609051bcf1 (diff)
downloadpoky-056b43353e87340e5262c61d229b668a788314ca.tar.gz
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
-rw-r--r--meta/classes/patch.bbclass7
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():
52 os.chdir(olddir) 52 os.chdir(olddir)
53 53
54 class PatchError(Exception): 54 class PatchError(Exception):
55 def __init__(self, patch, msg): 55 def __init__(self, msg):
56 self.msg = msg 56 self.msg = msg
57 self.patch = patch
58 57
59 def __str__(self): 58 def __str__(self):
60 return "Patch Error: patch %s: %s" % (os.path.basename(self.patch.file), self.msg) 59 return "Patch Error: %s" % self.msg
61 60
62 import bb, bb.data, bb.fetch 61 import bb, bb.data, bb.fetch
63 62
@@ -231,7 +230,7 @@ def patch_init():
231 230
232 shutil.copyfile(patch["quiltfile"], patch["file"]) 231 shutil.copyfile(patch["quiltfile"], patch["file"])
233 else: 232 else:
234 raise PatchError(patch, "Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type)) 233 raise PatchError("Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
235 else: 234 else:
236 # quilt refresh 235 # quilt refresh
237 args = ["refresh"] 236 args = ["refresh"]