← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~allenap/maas/distribute-here into lp:maas

 

Gavin Panella has proposed merging lp:~allenap/maas/distribute-here into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/distribute-here/+merge/110085
-- 
https://code.launchpad.net/~allenap/maas/distribute-here/+merge/110085
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/distribute-here into lp:maas.
=== modified file 'Makefile'
--- Makefile	2012-06-08 10:19:49 +0000
+++ Makefile	2012-06-13 15:11:21 +0000
@@ -25,8 +25,10 @@
 
 all: build doc
 
-bin/buildout: bootstrap.py distribute_setup.py
-	$(python) bootstrap.py --distribute --setup-source distribute_setup.py
+bin/buildout: bootstrap/bootstrap.py bootstrap/distribute_setup.py
+	$(python) bootstrap/bootstrap.py --distribute \
+	    --setup-source bootstrap/distribute_setup.py \
+	    --download-base $(PWD)/bootstrap
 	@touch --no-create $@  # Ensure it's newer than its dependencies.
 
 bin/database: bin/buildout buildout.cfg versions.cfg setup.py

=== added directory 'bootstrap'
=== renamed file 'bootstrap.py' => 'bootstrap/bootstrap.py'
=== added file 'bootstrap/distribute-0.6.24.tar.gz'
Binary files bootstrap/distribute-0.6.24.tar.gz	1970-01-01 00:00:00 +0000 and bootstrap/distribute-0.6.24.tar.gz	2012-06-13 15:11:21 +0000 differ
=== renamed file 'distribute_setup.py' => 'bootstrap/distribute_setup.py'