← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~gmb/launchpad/bug-678413 into lp:launchpad/devel

 

Graham Binns has proposed merging lp:~gmb/launchpad/bug-678413 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #678413 qastaging having difficulties starting/stopping - apidoc
  https://bugs.launchpad.net/bugs/678413


This branch fixes a problem with the Makefile which caused `make start` to fail on qastaging due to an already-existing apidoc directory.
-- 
https://code.launchpad.net/~gmb/launchpad/bug-678413/+merge/41476
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gmb/launchpad/bug-678413 into lp:launchpad/devel.
=== modified file 'Makefile'
--- Makefile	2010-11-19 08:00:12 +0000
+++ Makefile	2010-11-22 15:31:47 +0000
@@ -64,6 +64,7 @@
 	$(PY) ./utilities/make-dummy-hosted-branches
 
 $(API_INDEX): $(BZR_VERSION_INFO) $(PY)
+	rm -r $(APIDOC_DIR) $(APIDOC_DIR).tmp
 	mkdir -p $(APIDOC_DIR).tmp
 	LPCONFIG=$(LPCONFIG) $(PY) ./utilities/create-lp-wadl-and-apidoc.py --force "$(WADL_TEMPLATE)"
 	mv $(APIDOC_DIR).tmp $(APIDOC_DIR)


Follow ups