Launchpad itself

Merge lp:~frankban/launchpad/bug-980295-soyuz-upload into lp:launchpad

  1. bug-980295-soyuz-upload
  2. Merge into devel
Proposed by Francesco Banconi on 2012-04-17
Status: Merged
Approved by: Graham Binns on 2012-04-17
Approved revision: no longer in the source branch.
Merged at revision: 15109
Proposed branch: lp:~frankban/launchpad/bug-980295-soyuz-upload
Merge into: lp:launchpad
Diff against target: 36 lines (+0/-19)
1 file modified
lib/lp/soyuz/doc/soyuz-upload.txt (+0/-19)
To merge this branch: bzr merge lp:~frankban/launchpad/bug-980295-soyuz-upload
Reviewer Review Type Date Requested Status
Graham Binns (community) 2012-04-17 Approve on 2012-04-17
Review via email: mp+102255@code.launchpad.net

Description of the Change

== Proposed fix ==

I've tried to reproduce the bug without success, so I ended up using the solution
suggested by Julian here: https://bugs.launchpad.net/launchpad/+bug/980295/comments/2

== Implementation details ==

Removed the failing tests.

== Demo and Q/A ==

No QA.

To post a comment you must log in.
Graham Binns (gmb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt'
2--- lib/lp/soyuz/doc/soyuz-upload.txt 2011-12-29 05:29:36 +0000
3+++ lib/lp/soyuz/doc/soyuz-upload.txt 2012-04-17 08:57:26 +0000
4@@ -451,15 +451,6 @@
5 >>> stdout, stderr = process.communicate()
6 >>> print stdout
7 <BLANKLINE>
8- >>> print stderr
9- DEBUG Enabled by DEFAULT section
10- INFO Creating lockfile: ...
11- DEBUG Distribution: ubuntutest
12- ...
13- DEBUG Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz from library
14- DEBUG Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz from library
15- DEBUG Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc from library
16- ...
17
18 >>> transaction.commit()
19
20@@ -542,16 +533,6 @@
21 already marked as published in the database and, if the files are
22 already on disk, verify the contents are as expected.
23
24- >>> print stderr
25- DEBUG Enabled by DEFAULT section
26- INFO Creating lockfile: ...
27- DEBUG Distribution: ubuntutest
28- ...
29- DEBUG /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz is already in pool with the same content.
30- DEBUG /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz is already in pool with the same content.
31- DEBUG /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc is already in pool with the same content.
32- ...
33-
34 Check the publishing history again
35
36 >>> for pub in SSPPH.selectBy(