Launchpad itself

Merge lp:~mwhudson/launchpad/arrargh-no-sourcecode-testtools into lp:launchpad

  1. arrargh-no-sourcecode-testtools
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Paul Hummer
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/arrargh-no-sourcecode-testtools
Merge into: lp:launchpad
Diff against target: 10 lines (+0/-1)
1 file modified
utilities/sourcedeps.conf (+0/-1)
To merge this branch: bzr merge lp:~mwhudson/launchpad/arrargh-no-sourcecode-testtools
Reviewer Review Type Date Requested Status
Paul Hummer (community) code Approve
Review via email: mp+17337@code.launchpad.net

Commit message

Remove testtools from sourcedeps.conf, hopefully getting the bzr builder to run properly again.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

I carefully added the building of the new testtools to our setup, but didn't delete the old one in sourcedeps.conf :/

Revision history for this message
Paul Hummer (rockstar) :
review: Approve (code)
Revision history for this message
Jonathan Lange (jml) wrote :

On Thu, Jan 14, 2010 at 3:05 PM, Paul Hummer <email address hidden> wrote:
> Review: Approve code
>

I'm pretty sure my use-testtools branch (currently in ec2) fixes this too.

jml

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Jonathan Lange wrote:
> On Thu, Jan 14, 2010 at 3:05 PM, Paul Hummer <email address hidden> wrote:
>> Review: Approve code
>>
>
> I'm pretty sure my use-testtools branch (currently in ec2) fixes this too.

I don't think it will conflict :-)

Cheers,
mwh

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.conf'
2--- utilities/sourcedeps.conf 2010-01-11 13:39:08 +0000
3+++ utilities/sourcedeps.conf 2010-01-14 02:04:17 +0000
4@@ -13,6 +13,5 @@
5 subunit lp:~launchpad-pqm/subunit/trunk;revno=61
6 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040
7 testresources lp:~launchpad-pqm/testresources/dev;revno=16
8-testtools lp:~launchpad-pqm/testtools/trunk;revno=14
9 canonical-identity-provider lp:~launchpad-pqm/canonical-identity-provider/trunk;revno=8900 optional
10 shipit lp:~launchpad-pqm/shipit/trunk;revno=8901 optional