Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components into lp:developer-ubuntu-com

[Daniel Holbach]

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components]

200. By David Callé on 2016-03-23

Lightweight chechout deps

=== modified file 'Makefile'
--- Makefile	2016-01-18 23:57:19 +0000
+++ Makefile	2016-03-23 10:05:47 +0000
@@ -35,7 +35,7 @@
 	@echo internal_proxy=\"${internal_proxy}\" >> crontab
 	@echo "0 4 * * * cd ${PWD}; ./update_apidocs.sh > ${PWD}/../../logs/update_apidocs.log 2>${PWD}/../../logs/update_apidocs_errors.log" >> crontab
 	@echo "15 4 * * * cd ${PWD}; ${PYTHON} manage.py update-gadget-snaps > ${PWD}/../../logs/update_gadgetsnaps.log 2>${PWD}/../../logs/update_gadgetsnaps_errors.log" >> crontab
-	@echo "20 4 * * * cd ${PWD}; ${PYTHON} manage.py import-external-docs-branches > ${PWD}/../../logs/import-external-docs-branches.log 2>${PWD}/../../logs/import-external-docs-branches_errors.log" >> crontab
+	@echo "20 4 * * * cd ${PWD}; ${PYTHON} manage.py import_md > ${PWD}/../../logs/import_md.log 2>${PWD}/../../logs/import_md.log" >> crontab
 	@crontab ./crontab
 	@rm ./crontab
 
@@ -61,7 +61,7 @@
 update-pip-cache:
 	@echo "Updating pip-cache"
 	rm -rf pip-cache
-	bzr branch lp:developer-ubuntu-com/dependencies pip-cache
+	bzr checkout --lightweight lp:developer-ubuntu-com/dependencies pip-cache
 	pip install --exists-action=w --download pip-cache/ -r requirements.txt
 	bzr add pip-cache/* 
 	bzr commit pip-cache/ -m 'automatically updated devportal requirements'
@@ -72,7 +72,7 @@
 
 pip-cache:
 	@echo "Downloading pip-cache"
-	@bzr branch -r `cat pip-cache-revno.txt` lp:developer-ubuntu-com/dependencies pip-cache
+	@bzr checkout --lightweight -r `cat pip-cache-revno.txt` lp:developer-ubuntu-com/dependencies pip-cache
 
 env: pip-cache
 	@echo "Creating virtualenv"

=== modified file 'pip-cache-revno.txt'
--- pip-cache-revno.txt	2016-03-23 09:50:54 +0000
+++ pip-cache-revno.txt	2016-03-23 10:05:47 +0000
@@ -1,1 +1,1 @@
-22
+23