5 files changed, 13 insertions, 23 deletions

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index f127796c07..bd9b93a12d 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 07eb77dbfc..cd9410d04c 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 26820967a3..8e0423d762 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 751e514121..2aeb8b8fe1 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 5b3710f84f..40b5f2f3dc 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: