Merge lp:~thumper/launchpad/makefile-fix into lp:launchpad

[Tim Penhey]

[release-critical=abentley][r=henninge][ui=none][bug=683503]

Fix the codebrowse restart breakage that is the fallout of one of my previous branches that had some left-over cruft in the build Makefile rule.

[Henning Eggers (henninge)]

review: Approve (code)

[Aaron Bentley (abentley)]

review: Approve (release-critical)

[Tim Penhey (thumper)]

On Tue, 07 Dec 2010 11:16:07 you wrote:
> The proposal to merge lp:~thumper/launchpad/makefile-fix into lp:launchpad
> has been updated.
>
> Commit Message changed to:
>
> [release-critical=abentley][r=henninge][ui=none][bug=683503]

Well that was stupid. lp-land offered me the ability to edit the commit
message, which I did, but obviously it set the commit message over the api
before it got my edit.

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/06/2010 05:56 PM, Tim Penhey wrote:
> On Tue, 07 Dec 2010 11:16:07 you wrote:
>> The proposal to merge lp:~thumper/launchpad/makefile-fix into lp:launchpad
>> has been updated.
>>
>> Commit Message changed to:
>>
>> [release-critical=abentley][r=henninge][ui=none][bug=683503]
>
> Well that was stupid. lp-land offered me the ability to edit the commit
> message, which I did, but obviously it set the commit message over the api
> before it got my edit.

Is your bzr_editor configured properly? It should be a program that
does not fork into the background, only returning control when the file
has been edited. e.g. to use gvim, I specify "gvim -f"

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkz9a9MACgkQ0F+nu1YWqI0oMgCeKF2kJ4RdUcRDVRAU4ezmIz57
Uy8An0aHsPbCT/kC/jZuk+jiJswS5cSe
=icEm
-----END PGP SIGNATURE-----

[Tim Penhey (thumper)]

On Tue, 07 Dec 2010 12:07:37 you wrote:
> On 12/06/2010 05:56 PM, Tim Penhey wrote:
> > On Tue, 07 Dec 2010 11:16:07 you wrote:
> >> The proposal to merge lp:~thumper/launchpad/makefile-fix into
> >> lp:launchpad has been updated.
> >>
> >> Commit Message changed to:
> >>
> >> [release-critical=abentley][r=henninge][ui=none][bug=683503]
> >
> > Well that was stupid. lp-land offered me the ability to edit the commit
> > message, which I did, but obviously it set the commit message over the
> > api before it got my edit.
>
> Is your bzr_editor configured properly? It should be a program that
> does not fork into the background, only returning control when the file
> has been edited. e.g. to use gvim, I specify "gvim -f"

Well the script waited and submitted it correctly (afaik).

Tim

=== modified file 'Makefile'
--- Makefile	2010-11-30 12:53:20 +0000
+++ Makefile	2010-12-06 04:03:02 +0000
@@ -139,9 +139,6 @@
 	touch $(CODEHOSTING_ROOT)/config/launchpad-lookup.txt
 
 build: compile apidoc jsbuild css_combine
-	mkdir -p $(CODEHOSTING_ROOT)/mirrors
-	touch $(CODEHOSTING_ROOT)/rewrite.log
-	chmod 777 $(CODEHOSTING_ROOT)/rewrite.log
 
 css_combine: sprite_css bin/combine-css
 	${SHHH} bin/combine-css
@@ -376,7 +373,7 @@
 	$(RM) logs/thread*.request
 	$(RM) -r lib/mailman
 	$(RM) -rf lib/canonical/launchpad/icing/build/*
-	$(RM) -r $(CODEHOSTING_ROOT)
+	$(RM) -rf $(CODEHOSTING_ROOT)
 	$(RM) -rf $(APIDOC_DIR)
 	$(RM) -rf $(APIDOC_DIR).tmp
 	$(RM) $(BZR_VERSION_INFO)