From 6b195a8739256e017c3ec266037dc4d462b6b98a Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 20 Dec 2011 16:35:15 +0000
Subject: [PATCH] Add support to check_revision.py for building release
 branches (issue #325).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@432 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 tools/check_revision.py | 47 ++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/tools/check_revision.py b/tools/check_revision.py
index 47e709237..e9334dca2 100644
--- a/tools/check_revision.py
+++ b/tools/check_revision.py
@@ -34,7 +34,8 @@ if not options.quiet:
       cef_info['url']+"\n")
 
 # Retrieve the Chromium SVN info.
-chromium_info = get_svn_info(os.path.join(cef_dir, os.pardir))
+src_dir = os.path.join(cef_dir, os.pardir)
+chromium_info = get_svn_info(src_dir)
 if not options.quiet:
   sys.stdout.write('Using Chromium revision '+chromium_info['revision']+' @ '+\
       chromium_info['url']+"\n")
@@ -45,16 +46,42 @@ config = eval(read_file(compat_file), {'__builtins__': None}, None)
 
 error = False
 
-if chromium_info['url'] != config['chromium_url']:
-  error = True
-  sys.stderr.write("\nWARNING: Incorrect Chromium URL; found "+\
-      chromium_info['url']+', expected '+config['chromium_url']+"\n")
+if 'release_url' in config:
+  current_release_url = None
+  path = os.path.join(os.path.join(src_dir, os.pardir), '.gclient')
+  if os.path.exists(path):
+    # read the .gclient file
+    fp = open(path, 'r')
+    data = fp.read()
+    fp.close()
+
+    # Parse the contents
+    config_dict = {}
+    try:
+      exec(data, config_dict)
+      current_release_url = config_dict['solutions'][0]['url']
+    except Exception, e:
+      sys.stderr.write('Failed to parse existing .glient file.\n')
+      raise
+
+  if not options.quiet:
+    sys.stdout.write('Using Chromium release '+current_release_url+"\n")
+
+  if current_release_url != config['release_url']:
+    error = True
+    sys.stderr.write("\nWARNING: Incorrect Chromium release URL; found "+\
+        current_release_url+', expected '+config['release_url']+"\n")
+else:
+  if chromium_info['url'] != config['chromium_url']:
+    error = True
+    sys.stderr.write("\nWARNING: Incorrect Chromium URL; found "+\
+        chromium_info['url']+', expected '+config['chromium_url']+"\n")
+
+  if chromium_info['revision'] != config['chromium_revision']:
+    error = True
+    sys.stderr.write("\nWARNING: Incorrect Chromium revision; found "+\
+        chromium_info['revision']+', expected '+config['chromium_revision']+"\n")
 
-if chromium_info['revision'] != config['chromium_revision']:
-  error = True
-  sys.stderr.write("\nWARNING: Incorrect Chromium revision; found "+\
-      chromium_info['revision']+', expected '+config['chromium_revision']+"\n")
-      
 if error:
   sys.stderr.write("\nPlease see CHROMIUM_BUILD_COMPATIBILITY.txt for "\
       "instructions.\n")