Docserver: don't allow updating subversion beyond when the app itself existed.

In other words, if the currently running app is 2-0-1 and a change is pushed to
bring it to 2-0-2, never fetch any new content from then onwards. This will
allow for parallel content + server pushes.

BUG=236600
R=cduvall@chromium.org

Review URL: https://codereview.chromium.org/14247024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199503 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/chrome/common/extensions/docs/server2/appengine_wrappers.py b/chrome/common/extensions/docs/server2/appengine_wrappers.py
index 745ec35..86a43e4 100644
--- a/chrome/common/extensions/docs/server2/appengine_wrappers.py
+++ b/chrome/common/extensions/docs/server2/appengine_wrappers.py
@@ -4,19 +4,16 @@
 
 import os
 
+from app_yaml_helper import AppYamlHelper
+
 def GetAppVersion():
   if 'CURRENT_VERSION_ID' in os.environ:
     # The version ID looks like 2-0-25.36712548, we only want the 2-0-25.
     return os.environ['CURRENT_VERSION_ID'].split('.', 1)[0]
-  # Not running on appengine, get it from the app.yaml file ourselves. We
-  # could properly parse this using a yaml library but Python doesn't have
-  # one built in so whatevs.
-  version_key = 'version:'
+  # Not running on appengine, get it from the app.yaml file ourselves.
   app_yaml_path = os.path.join(os.path.split(__file__)[0], 'app.yaml')
   with open(app_yaml_path, 'r') as app_yaml:
-    version_line = [line for line in app_yaml.read().split('\n')
-                    if line.startswith(version_key)][0]
-  return version_line[len(version_key):].strip()
+    return AppYamlHelper.ExtractVersion(app_yaml.read())
 
 def IsDevServer():
   return os.environ.get('SERVER_SOFTWARE', '').find('Development') == 0