Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: client/deps/pgpool/pgpool.py

Issue 3511003: Merge remote branch 'cros/upstream' into tempbranch2 (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:
View side-by-side diff with in-line comments
Download patch
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)

Powered by Google App Engine
This is Rietveld 408576698