diff options
Diffstat (limited to 'bitbake/lib/bb/fetch')
| -rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 11 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/osc.py | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 07eb77dbf..cd9410d04 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -31,6 +31,7 @@ import logging import bb from bb import data from bb import persist_data +from bb import utils logger = logging.getLogger("BitBake.Fetch") @@ -217,12 +218,6 @@ def init(urls, d, setup = True): def mirror_from_string(data): return [ i.split() for i in (data or "").replace('\\n','\n').split('\n') if i ] -def removefile(f): - try: - os.remove(f) - except: - pass - def verify_checksum(u, ud, d): """ verify the MD5 and SHA256 checksum for downloaded src @@ -293,7 +288,7 @@ def go(d, urls = None): localpath = ud.localpath except FetchError: # Remove any incomplete file - removefile(ud.localpath) + bb.utils.remove(ud.localpath) # Finally, try fetching uri, u, from MIRRORS mirrors = mirror_from_string(bb.data.getVar('MIRRORS', d, True)) localpath = try_mirrors (d, u, mirrors) @@ -517,7 +512,7 @@ def try_mirrors(d, uri, mirrors, check = False, force = False): import sys (type, value, traceback) = sys.exc_info() logger.debug(2, "Mirror fetch failure: %s", value) - removefile(ud.localpath) + bb.utils.remove(ud.localpath) continue return None diff --git a/bitbake/lib/bb/fetch/osc.py b/bitbake/lib/bb/fetch/osc.py index 26820967a..8e0423d76 100644 --- a/bitbake/lib/bb/fetch/osc.py +++ b/bitbake/lib/bb/fetch/osc.py @@ -11,6 +11,7 @@ import sys import logging import bb from bb import data +from bb import utils from bb.fetch import Fetch from bb.fetch import FetchError from bb.fetch import MissingParameterError @@ -123,8 +124,7 @@ class Osc(Fetch): """ config_path = os.path.join(data.expand('${OSCDIR}', d), "oscrc") - if (os.path.exists(config_path)): - os.remove(config_path) + bb.utils.remove(config_path) f = open(config_path, 'w') f.write("[general]\n") |