From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 4 Nov 2013 14:42:01 +0000 (+0100)
Subject: Fix sed typo that broke forceversion and forcevercode
X-Git-Tag: 0.1~232
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=22a02a02c4353a247ba8fbc350009b2b68abf05e;p=fdroidserver.git

Fix sed typo that broke forceversion and forcevercode
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 28f85437..11d820d4 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1503,7 +1503,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
             if not os.path.isfile(path):
                 continue
             if subprocess.call(['sed','-i',
-                's/android:versionName="[^"]+"/android:versionName="' + build['version'] + '"/g',
+                's/android:versionName="[^"]*"/android:versionName="' + build['version'] + '"/g',
                 path]) != 0:
                 raise BuildException("Failed to amend manifest")
     if 'forcevercode' in build:
@@ -1512,7 +1512,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
             if not os.path.isfile(path):
                 continue
             if subprocess.call(['sed','-i',
-                's/android:versionCode="[^"]+"/android:versionCode="' + build['vercode'] + '"/g',
+                's/android:versionCode="[^"]*"/android:versionCode="' + build['vercode'] + '"/g',
                 path]) != 0:
                 raise BuildException("Failed to amend manifest")