ensure_dependencies.py - Issue 5135047623442432: Issue 1808 - ensure_dependencies.py generates wrong repository path for local roots

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: ensure_dependencies.py

Issue 5135047623442432: Issue 1808 - ensure_dependencies.py generates wrong repository path for local roots (Closed)

Patch Set: Created Jan. 14, 2015, 9:23 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: ensure_dependencies.py

===================================================================

--- a/ensure_dependencies.py

+++ b/ensure_dependencies.py

@@ -182,17 +182,21 @@ def ensure_repo(parentrepo, target, root

parenttype = get_repo_type(parentrepo)

type = None

for key in roots:

if key == parenttype or (key in repo_types and type is None):

type = key

if type is None:

raise Exception("No valid source found to create %s" % target)

- url = urlparse.urljoin(roots[type], sourcename)

+ if os.path.exists(roots[type]):

+ url = os.path.join(roots[type], sourcename)

+ else:

+ url = urlparse.urljoin(roots[type], sourcename)

logging.info("Cloning repository %s into %s" % (url, target))

repo_types[type].clone(url, target)

for repo in repo_types.itervalues():

if repo.istype(parentrepo):

repo.ignore(target, parentrepo)

def update_repo(target, revisions):

« no previous file with comments | « no previous file | no next file » | no next file with comments »