From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 16 Feb 2012 20:59:24 +0000 (+0200)
Subject: Remove support for deprecated insertversion/insertvercode
X-Git-Tag: 0.1~952^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=10567fc0cca2e53e20b4fbfd69dc50109ad65a6f;p=fdroidserver.git

Remove support for deprecated insertversion/insertvercode

No longer occur in metadata.
---

diff --git a/common.py b/common.py
index 8fb0f2cd..8043eadd 100644
--- a/common.py
+++ b/common.py
@@ -736,18 +736,6 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
         f.write(props)
         f.close()
 
-    # deprecated, use forceversion/forcevercode instead
-    if build.has_key('insertversion'):
-        if subprocess.call(['sed','-i','s/' + build['insertversion'] +
-            '/' + build['version'] +'/g',
-            'AndroidManifest.xml'], cwd=root_dir) !=0:
-            raise BuildException("Failed to amend manifest")
-    if build.has_key('insertvercode'):
-        if subprocess.call(['sed','-i','s/' + build['insertvercode'] +
-            '/' + build['vercode'] +'/g',
-            'AndroidManifest.xml'], cwd=root_dir) !=0:
-            raise BuildException("Failed to amend manifest")
-
     # Insert version code and number into the manifest if necessary...
     if build.has_key('forceversion'):
         if subprocess.call(['sed','-r','-i',