From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 30 May 2012 09:18:15 +0000 (+0800)
Subject: generate-manifest-2.7.py: replace os.popen with os.unlink
X-Git-Tag: 2015-4~10443
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bc9f7d7b7eda1c45ad1aaee469ebe28ee1c0c96b;p=openembedded-core.git

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@windriver.com>
---

diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index 7b43137bd8..5c527241e7 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