chiark / gitweb /
Made 'rm' build option work if file doesn't exist
authorCiaran Gultnieks <ciaran@ciarang.com>
Mon, 23 Jan 2012 13:49:17 +0000 (13:49 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Mon, 23 Jan 2012 13:49:17 +0000 (13:49 +0000)
The latest platform tools delete build.properties, the old ones didn't.
This allows several builds to work either way.

common.py

index e651e542caebaa838d0bd1d5826b3e91baef3469..c81fd30100b3f32cbc945b1108183cbc86b1d4ea 100644 (file)
--- a/common.py
+++ b/common.py
@@ -633,7 +633,9 @@ def prepare_source(vcs, app, build, build_dir, sdk_path, ndk_path, javacc_path,
 
     # Delete unwanted file...
     if build.has_key('rm'):
-        os.remove(os.path.join(build_dir, build['rm']))
+        dest = os.path.join(build_dir, build['rm'])
+        if os.path.exists(dest):
+            os.remove(dest)
 
     # Fix apostrophes translation files if necessary...
     if build.get('fixapos', 'no') == 'yes':