diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-04 10:26:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-10 23:37:00 +0000 |
commit | d0ffe023c4a642c8d1c188ec499870e7a7113d7d (patch) | |
tree | 5d22edd49e9e733643c73959bbbebee55d3df089 /lib/bb/fetch2/osc.py | |
parent | e448fa0432d12cc54f0b540fe2cacff37135c9ed (diff) | |
download | bitbake-d0ffe023c4a642c8d1c188ec499870e7a7113d7d.tar.gz |
bitbake/fetch2: Rewrite and improve exception handling, reusing core functions for common operations where possible
(From Poky rev: d08397ba4d1331993300eacbb2f78fcfef19c1cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/osc.py')
-rw-r--r-- | lib/bb/fetch2/osc.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/bb/fetch2/osc.py b/lib/bb/fetch2/osc.py index 14bde82fd..9b97cf1cc 100644 --- a/lib/bb/fetch2/osc.py +++ b/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 |