Split out URLs being rewritten into a dict as per review.

1 files changed, 9 insertions, 15 deletions

diff --git a/build-scripts/rewrite-manifest.py b/build-scripts/rewrite-manifest.py
index 6e6a390..49146ce 100755
--- a/build-scripts/rewrite-manifest.py
+++ b/build-scripts/rewrite-manifest.py
@@ -6,6 +6,12 @@ from xml.etree.cElementTree import (
 )
 import sys
 
+rewrite_urls = {
+    'git://git.linaro.org': 'http://git.linaro.org/git-ro',
+    'git://git.linaro.org/': 'http://git.linaro.org/git-ro/',
+    'git://android.git.linaro.org': 'http://android.git.linaro.org/git-ro',
+    'git://android.git.linaro.org/': 'http://android.git.linaro.org/git-ro/',
+}
 
 def rewrite_git_urls(root):
     """Rewrites all android.git.linaro.org and git.linaro.org URLs.
@@ -20,21 +26,9 @@ def rewrite_git_urls(root):
         if default_remote is None:
             default_remote = remote.get('name')
 
-        # Replace git://git.linaro.org/ and http://git.linaro.org/git/
-        # base URLs with the scalable http://git.linaro.org/git-ro/.
-        if remote.get('fetch') in (
-            'git://git.linaro.org', 'git://git.linaro.org/',
-            'http://git.linaro.org/git', 'http://git.linaro.org/git/'):
-            remote.set('fetch', 'http://git.linaro.org/git-ro/')
-            remotes_to_handle.add(remote.get('name'))
-        # Replace git://android.git.linaro.org/ and
-        # http://android.git.linaro.org/git/ base URLs with the scalable
-        # http://git.linaro.org/git-ro/.
-        elif remote.get('fetch') in (
-            'git://android.git.linaro.org', 'git://android.git.linaro.org/',
-            'http://android.git.linaro.org/git',
-            'http://android.git.linaro.org/git/'):
-            remote.set('fetch', 'http://android.git.linaro.org/git-ro/')
+        remote_url = remote.get('fetch')
+        if remote_url in rewrite_urls:
+            remote.set('fetch', rewrite_urls[remote_url])
             remotes_to_handle.add(remote.get('name'))
 
     for project in root.findall("project"):