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/bzr.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'bitbake/lib/bb/fetch2/bzr.py') diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 1e25207b19..22168a8351 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py @@ -72,7 +72,7 @@ class Bzr(Fetch): elif command is "update": bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) else: - raise FetchError("Invalid bzr command %s" % command) + raise FetchError("Invalid bzr command %s" % command, ud.url) return bzrcmd @@ -104,15 +104,7 @@ class Bzr(Fetch): tar_flags = "--exclude '.bzr' --exclude '.bzrtags'" # tar them up to a defined filename - try: - runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), 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, os.path.basename(ud.pkgdir)), d, cleanup = [ud.localpath]) def supports_srcrev(self): return True -- cgit v1.2.3-54-g00ecf