summaryrefslogtreecommitdiff
path: root/meta/classes
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 /meta/classes
parentc69404a7d57f922c437b783ff3dcdf609051bcf1 (diff)
downloadopenembedded-core-056b43353e87340e5262c61d229b668a788314ca.tar.gz
openembedded-core-056b43353e87340e5262c61d229b668a788314ca.tar.bz2
openembedded-core-056b43353e87340e5262c61d229b668a788314ca.tar.xz
openembedded-core-056b43353e87340e5262c61d229b668a788314ca.zip
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
Diffstat (limited to 'meta/classes')
-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 aa54d9b32..6f6dc0e30 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"]