Skip to content

Commit

Permalink
Bugfix in jvm run.
Browse files Browse the repository at this point in the history
(sapling split of ea67b11b3eaf9843dac85602052a759c836f06f5)
  • Loading branch information
Benjy committed Jul 8, 2013
1 parent 9a4bc45 commit c9c812e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build-support/python/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pushd $CACHE >& /dev/null
if ! test -f virtualenv-1.7.1.2.tar.gz; then
echo 'Installing virtualenv' 1>&2
for url in \
https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.7.1.2.tar.gz \
http://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.7.1.2.tar.gz \
https://svn.twitter.biz/science-binaries/home/third_party/python/virtualenv-1.7.1.2.tar.gz; do
if curl --connect-timeout 10 -O $url; then
break
Expand All @@ -49,7 +49,7 @@ if $PYTHON $CACHE/virtualenv-1.7.1.2/virtualenv.py -p $PY --distribute $BOOTSTRA
pip install \
--download-cache=$CACHE \
-f https://svn.twitter.biz/science-binaries/home/third_party/python \
-f https://pypi.python.org/simple \
-f http://pypi.python.org/simple \
-U --no-index $pkg
done
deactivate
Expand Down
4 changes: 2 additions & 2 deletions pants.ini
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ download_cache: %(pants_workdir)s/python/downloads
install_cache: %(pants_workdir)s/python/eggs

virtualenv_target: %(bootstrap_cache)s/virtualenv-1.7.1.2
virtualenv_urls: ['https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.7.1.2.tar.gz']
virtualenv_urls: ['http://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.7.1.2.tar.gz']
bootstrap_packages: ['pip', 'pystache']

platforms: ['current']
Expand All @@ -374,7 +374,7 @@ platforms: ['current']
repos: [
'https://raw.github.com/twitter/commons/binaries/pants/third_party/python/dist/index.html']

indices: ['https://pypi.python.org']
indices: ['pypi.python.org']

allow_pypi: True

Expand Down
2 changes: 1 addition & 1 deletion src/python/twitter/pants/tasks/jvm_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def run_workunit_factory(name, labels=list(), cmd=''):

result = runjava_indivisible(
jvmargs=self.jvm_args,
classpath=(self.classpath(confs=self.confs)),
classpath=(self.classpath(confs=self.confs, exclusives_classpath=group_classpath)),
main=main,
args=self.args,
dryrun=dryrun,
Expand Down

0 comments on commit c9c812e

Please sign in to comment.