From 09a7dc9a4654719699258ba9422f14095147c7c2 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 30 May 2012 17:18:15 +0800 Subject: 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] (From OE-Core rev: bc9f7d7b7eda1c45ad1aaee469ebe28ee1c0c96b) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/contrib/python/generate-manifest-2.7.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/contrib') 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 -- cgit v1.2.3-54-g00ecf