swift-debian broken since build #104
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
OpenStack Core Infrastructure |
Invalid
|
Undecided
|
Unassigned |
Bug Description
Build #104 console output is:
Started by upstream project "swift" build number 135
Building on master
$ bzr revision-info -d /var/lib/
[workspace] $ bzr pull --overwrite lp:swift/debian
No revisions to pull.
$ bzr revision-info -d /var/lib/
[workspace] $ bzr log -v -r revid:<email address hidden>:<email address hidden> --long --show-ids
Getting local revision...
$ bzr revision-info -d /var/lib/
<email address hidden>
[workspace] $ /bin/sh -xe /tmp/hudson3752
+ bzr merge lp:swift
M bin/st
M bin/swift-
M bin/swift-
M bin/swift-
M bin/swift-
M bin/swift-bench
M bin/swift-
M bin/swift-get-nodes
M bin/swift-
M bin/swift-
M bin/swift-
M bin/swift-
M bin/swift-
M swift/__init__.py
M swift/common/
M swift/common/
M test/unit/
Text conflict in swift/__init__.py
1 conflicts encountered.
Finished: FAILURE
which then resulted in the following build failures:
Started by upstream project "swift" build number 136
Building on master
$ bzr revision-info -d /var/lib/
[workspace] $ bzr pull --overwrite lp:swift/debian
No revisions to pull.
$ bzr revision-info -d /var/lib/
[workspace] $ bzr log -v -r revid:<email address hidden>:<email address hidden> --long --show-ids
Getting local revision...
$ bzr revision-info -d /var/lib/
<email address hidden>
[workspace] $ /bin/sh -xe /tmp/hudson8111
+ bzr merge lp:swift
bzr: ERROR: Working tree "/var/lib/
Finished: FAILURE
This job doesn't exist anymore, perhaps superseded by swift-ppa.