client/deps/pgpool/pgpool.py - Issue 3554003: Merge remote branch 'cros/upstream' into tempbranch3

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/pgpool/pgpool.py

Issue 3554003: Merge remote branch 'cros/upstream' into tempbranch3 (Closed) Base URL: http://git.chromium.org/git/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/pgpool/pgpool.py

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

index c4caab56cbaa19e985b6ab0d316658b99a735e5b..1c52bfbec38f87f7964a3e7748a0c70c0fdbb266 100755

--- a/client/deps/pgpool/pgpool.py

+++ b/client/deps/pgpool/pgpool.py

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

#!/usr/bin/python

import os

-import common

from autotest_lib.client.bin import utils

version = 1

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

os.chdir(srcdir)

# FIXEME - Waiting to be able to use self.autodir instead of

# os.environ['AUTODIR']

- utils.system('./configure --prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \

+ utils.configure('--prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \

% (topdir, os.environ['AUTODIR']))

- utils.system('make -j %d' % utils.count_cpus())

- utils.system('make install')

+ utils.make('-j %d' % utils.count_cpus())

+ utils.make('install')

os.chdir(topdir)

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