From d08397ba4d1331993300eacbb2f78fcfef19c1cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 4 Feb 2011 10:26:21 +0000 Subject: bitbake/fetch2: Rewrite and improve exception handling, reusing core functions for common operations where possible Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/hg.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'bitbake/lib/bb/fetch2/hg.py') diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index 6929d971f..ffede8cf5 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py @@ -48,7 +48,7 @@ class Hg(Fetch): init hg specific variable within url data """ if not "module" in ud.parm: - raise MissingParameterError("hg method needs a 'module' parameter") + raise MissingParameterError('module', ud.url) ud.module = ud.parm["module"] @@ -105,7 +105,7 @@ class Hg(Fetch): elif command is "update": cmd = "%s update -C %s" % (basecmd, " ".join(options)) else: - raise FetchError("Invalid hg command %s" % command) + raise FetchError("Invalid hg command %s" % command, ud.url) return cmd @@ -147,15 +147,7 @@ class Hg(Fetch): tar_flags = "--exclude '.hg' --exclude '.hgrags'" os.chdir(ud.pkgdir) - try: - runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.module), d) - except: - t, v, tb = sys.exc_info() - try: - os.unlink(ud.localpath) - except OSError: - pass - raise t, v, tb + runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.module), d, cleanup = [ud.localpath]) def supports_srcrev(self): return True -- cgit v1.2.3