chrome/common/extensions/docs/server2/branch_utility.py - Issue 10500004: Die build.py, Die: Part 2 (LocalFetcher, Handlebar support, build script)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/docs/server2/branch_utility.py

Issue 10500004: Die build.py, Die: Part 2 (LocalFetcher, Handlebar support, build script) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: TemplateFetcher now has dictionary interface Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/docs/server2/.gitignore ('k') | chrome/common/extensions/docs/server2/build_server.py » ('j') | chrome/common/extensions/docs/server2/echo_handler.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/server2/branch_utility.py

diff --git a/chrome/common/extensions/docs/server2/branch_utility.py b/chrome/common/extensions/docs/server2/branch_utility.py

index a395fc45c8b34c98099fa37f170799e28e9e2fc3..5d386ebba205ed1d7b7c3e787651d9209ba9f7ef 100644

--- a/chrome/common/extensions/docs/server2/branch_utility.py

+++ b/chrome/common/extensions/docs/server2/branch_utility.py

@@ -18,7 +18,7 @@ class BranchUtility(object):

def GetChannelNameFromPath(self, path):

first_part = path.split('/')[0]

- if first_part in ['trunk', 'dev', 'beta', 'stable']:

+ if first_part in ['trunk', 'dev', 'beta', 'stable', 'local']:

return first_part

else:

return 'stable'

@@ -27,8 +27,8 @@ class BranchUtility(object):

"""Returns an empty string if the branch number cannot be found.

Throws exception on network errors.

"""

- if channel_name == 'trunk':

- return 'trunk'

+ if channel_name == 'trunk' or channel_name == 'local':

+ return channel_name

fetch_data = self.urlfetch.fetch(self.omaha_proxy_url)

if fetch_data.content == '':