From 2ef204dcdd28d60819ad7a413426b9676c54a3a4 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Mon, 10 Jan 2011 23:05:19 +0100
Subject: *: use utils.remove() some more
(Bitbake rev: d3489b141cac1197324661680fe38b8a88bc49b4)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
bitbake/lib/bb/build.py | 6 ++----
bitbake/lib/bb/fetch/__init__.py | 11 +++--------
bitbake/lib/bb/fetch/osc.py | 4 ++--
bitbake/lib/bb/fetch2/__init__.py | 11 +++--------
bitbake/lib/bb/utils.py | 4 +++-
5 files changed, 13 insertions(+), 23 deletions(-)
(limited to 'bitbake')
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index f127796c0..bd9b93a12 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -405,9 +405,8 @@ def make_stamp(task, d, file_name = None):
stamp = stamp_internal(task, d, file_name)
# Remove the file and recreate to force timestamp
# change on broken NFS filesystems
- if os.access(stamp, os.F_OK):
- os.remove(stamp)
if stamp:
+ bb.utils.remove(stamp)
f = open(stamp, "w")
f.close()
@@ -417,8 +416,7 @@ def del_stamp(task, d, file_name = None):
(d can be a data dict or dataCache)
"""
stamp = stamp_internal(task, d, file_name)
- if os.access(stamp, os.F_OK):
- os.remove(stamp)
+ bb.utils.remove(stamp)
def stampfile(taskname, d):
return stamp_internal(taskname, d, None)
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")
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 751e51412..2aeb8b8fe 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__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)
@@ -503,7 +498,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/utils.py b/bitbake/lib/bb/utils.py
index 5b3710f84..40b5f2f3d 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -582,10 +582,12 @@ def build_environment(d):
def remove(path, recurse=False):
"""Equivalent to rm -f or rm -rf"""
+ if not path:
+ return
import os, errno, shutil
try:
os.unlink(path)
- except OSError, exc:
+ except OSError as exc:
if recurse and exc.errno == errno.EISDIR:
shutil.rmtree(path)
elif exc.errno != errno.ENOENT:
--
cgit v1.2.3