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/svn.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'bitbake/lib/bb/fetch2/svn.py') diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index 5ff064ebf3..267c9bb7e6 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py @@ -47,7 +47,7 @@ class Svn(Fetch): init svn specific variable within url data """ if not "module" in ud.parm: - raise MissingParameterError("svn method needs a 'module' parameter") + raise MissingParameterError('module', ud.url) ud.module = ud.parm["module"] @@ -118,7 +118,7 @@ class Svn(Fetch): elif command is "update": svncmd = "%s update %s" % (basecmd, " ".join(options)) else: - raise FetchError("Invalid svn command %s" % command) + raise FetchError("Invalid svn command %s" % command, ud.url) if svn_rsh: svncmd = "svn_RSH=\"%s\" %s" % (svn_rsh, svncmd) @@ -156,15 +156,7 @@ class Svn(Fetch): os.chdir(ud.pkgdir) # tar them up to a defined filename - 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