client/deps/boottool/boottool.py - Issue 3541002: Revert "Merge remote branch 'cros/upstream' into tempbranch2"

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/deps/boottool/boottool.py

Issue 3541002: Revert "Merge remote branch 'cros/upstream' into tempbranch2" (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git

Patch Set: Created 10 years, 3 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/deps/boottool/boottool.py

diff --git a/client/deps/boottool/boottool.py b/client/deps/boottool/boottool.py

index a391be39696555a2d3dd323d47416832b60c863b..2718af1fc967d653c89ef040034164166b260324 100755

--- a/client/deps/boottool/boottool.py

+++ b/client/deps/boottool/boottool.py

@@ -1,6 +1,7 @@

#!/usr/bin/python

import os

+import common

from autotest_lib.client.bin import utils

# To use this, you have to set PERL5LIB to:

@@ -15,9 +16,9 @@ def setup(tarball, topdir):

srcdir = os.path.join(topdir, 'src')

utils.extract_tarball_to_dir(tarball, srcdir)

os.chdir(srcdir)

- utils.system('perl Makefile.PL PREFIX=' + topdir)

- utils.make()

- utils.make('install')

+ utils.system ('perl Makefile.PL PREFIX=' + topdir)

+ utils.system ('make')

+ utils.system ('make install')

os.chdir(topdir)

« no previous file with comments | « client/common_lib/utils_unittest.py ('k') | client/deps/boottool/common.py » ('j') | no next file with comments »