[oe-commits] Robert Yang : generate-manifest-2.7.py: replace os.popen with os.unlink

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: bc9f7d7b7eda1c45ad1aaee469ebe28ee1c0c96b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bc9f7d7b7eda1c45ad1aaee469ebe28ee1c0c96b

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Wed May 30 17:18:15 2012 +0800

generate-manifest-2.7.py: replace os.popen with os.unlink

The os.popen function would fail (more or less) silently if the executed
program cannot be found, and here what we need is os.system not os.popen
since it doesn't use the return value, use os.unlink() and ignore
exceptions from it would be better as Chris suggested.

[YOCTO #2454]

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 scripts/contrib/python/generate-manifest-2.7.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index 7b43137..5c52724 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -149,7 +149,10 @@ class MakefileMaker:
 if __name__ == "__main__":
 
     if len( sys.argv ) > 1:
-        os.popen( "rm -f ./%s" % sys.argv[1] )
+        try:
+            os.unlink(sys.argv[1])
+        except Exception:
+            sys.exc_clear()
         outfile = file( sys.argv[1], "w" )
     else:
         outfile = sys.stdout