client/bin/kernel.py - Issue 1595019: Merge remote branch 'origin/upstream' into tempbranch

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: client/bin/kernel.py

Issue 1595019: Merge remote branch 'origin/upstream' into tempbranch (Closed)

Patch Set: Created 10 years, 8 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:

Index: client/bin/kernel.py

diff --git a/client/bin/kernel.py b/client/bin/kernel.py

index b0fc543473748aeba068d29f4a7156ecf386b93b..b39869710c83b935416bc43cbb843c345d69df40 100644

--- a/client/bin/kernel.py

+++ b/client/bin/kernel.py

@@ -271,7 +271,7 @@ class kernel(object):

else:

os.chdir(os.path.dirname(self.src_dir))

# Figure out local destination for tarball

- tarball = os.path.join(self.src_dir, os.path.basename(base_tree))

+ tarball = os.path.join(self.src_dir, os.path.basename(base_tree.split(';')[0]))

utils.get_file(base_tree, tarball)

print 'Extracting kernel tarball:', tarball, '...'

utils.extract_tarball_to_dir(tarball, self.build_dir)

« no previous file with comments | « client/bin/harness_autoserv.py ('k') | client/common_lib/base_packages.py » ('j') | no next file with comments »