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/osc.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'bitbake/lib/bb/fetch2/osc.py') diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 14bde82fd..9b97cf1cc 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py @@ -28,7 +28,7 @@ class Osc(Fetch): def urldata_init(self, ud, d): if not "module" in ud.parm: - raise MissingParameterError("osc method needs a 'module' parameter.") + raise MissingParameterError('module', ud.url) ud.module = ud.parm["module"] @@ -73,7 +73,7 @@ class Osc(Fetch): elif command is "update": osccmd = "%s %s up %s" % (basecmd, config, " ".join(options)) else: - raise FetchError("Invalid osc command %s" % command) + raise FetchError("Invalid osc command %s" % command, ud.url) return osccmd @@ -104,15 +104,7 @@ class Osc(Fetch): os.chdir(os.path.join(ud.pkgdir + ud.path)) # tar them up to a defined filename - try: - runfetchcmd("tar -czf %s %s" % (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 -czf %s %s" % (ud.localpath, ud.module), d, cleanup = [ud.localpath]) def supports_srcrev(self): return False -- cgit v1.2.3