From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 23 Jan 2012 13:49:17 +0000 (+0000)
Subject: Made 'rm' build option work if file doesn't exist
X-Git-Tag: 0.1~1068
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=17cd20fabfbc4d2f9432b74ce2c639e121641f5c;p=fdroidserver.git

Made 'rm' build option work if file doesn't exist

The latest platform tools delete build.properties, the old ones didn't.
This allows several builds to work either way.
---

diff --git a/common.py b/common.py
index e651e542..c81fd301 100644
--- 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':