Merge lp:~jelmer/launchpad/bug499115 into lp:launchpad/db-devel
Proposed by
Jelmer Vernooij
Status: | Rejected |
---|---|
Rejected by: | Jelmer Vernooij |
Proposed branch: | lp:~jelmer/launchpad/bug499115 |
Merge into: | lp:launchpad/db-devel |
Diff against target: |
140 lines (+59/-18) (has conflicts) 2 files modified
lib/lp/buildmaster/model/buildbase.py (+30/-18) lib/lp/buildmaster/tests/test_buildbase.py (+29/-0) Text conflict in lib/lp/buildmaster/model/buildbase.py |
To merge this branch: | bzr merge lp:~jelmer/launchpad/bug499115 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Henning Eggers (community) | code | Needs Fixing | |
Review via email: mp+19328@code.launchpad.net |
This proposal supersedes a proposal from 2010-02-11.
To post a comment you must log in.
This trivial change prevents the buildd master from falling over if a container directory was created but no log file uploaded. (bug 499115)