chiark / gitweb /
Fix sed typo that broke forceversion and forcevercode
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 4 Nov 2013 14:42:01 +0000 (15:42 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 4 Nov 2013 14:42:01 +0000 (15:42 +0100)
fdroidserver/common.py

index 28f8543703e6f1717a4fd44523a313d89df40d18..11d820d4fee02741f2b6a9a5aae1f5f0118fb9a7 100644 (file)
@@ -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")