Merge lp://staging/~niedbalski/ubuntu/trusty/oslo.messaging/fix-lp-1338732 into lp://staging/~ubuntu-cloud-archive/ubuntu/trusty/oslo.messaging/juno

Proposed by Jorge Niedbalski
Status: Merged
Merged at revision: 2
Proposed branch: lp://staging/~niedbalski/ubuntu/trusty/oslo.messaging/fix-lp-1338732
Merge into: lp://staging/~ubuntu-cloud-archive/ubuntu/trusty/oslo.messaging/juno
Diff against target: 196 lines (+176/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/0006-Declare-DirectPublisher-exchanges-with-passive-True.patch (+166/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://staging/~niedbalski/ubuntu/trusty/oslo.messaging/fix-lp-1338732
Reviewer Review Type Date Requested Status
Chuck Short (community) Needs Fixing
Corey Bryant Pending
Review via email: mp+270751@code.staging.launchpad.net

Description of the change

Fix for LP #1338732

To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

chagnelog should be 1.4.1-0ubuntu1.1~cloud1 and should be targeted at trusty-juno rather than utopic.

review: Needs Fixing
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Re-submitted addressing @zulcss comment.

Revision history for this message
Chuck Short (zulcss) wrote :

patch doesnt apply either:

dh: Unknown sequence get-orig-source (choose from: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep)
debian/rules:7: recipe for target 'get-orig-source' failed
make: *** [get-orig-source] Error 255
Trying to run get-orig-source rule failed
Using uscan to look for the upstream tarball.
oslo.messaging: Version (1.4.1) available on remote site:
  http://tarballs.openstack.org/oslo.messaging/oslo.messaging-1.4.1.tar.gz
  (local version is 1.4.1)
Successfully downloaded updated package oslo.messaging-1.4.1.tar.gz
Successfully renamed /tmp/x/oslo.messaging-1.4.1.tar.gz to /tmp/x/oslo.messaging_1.4.1.orig.tar.gz.
bzr: ERROR: An error (1) occurred running quilt: None

Applying patch /tmp/x/build-area/oslo.messaging-1.4.1/debian/patches/zmq-server-routing.patch
patching file oslo/messaging/_drivers/impl_zmq.py
Hunk #1 FAILED at 939.
1 out of 1 hunk FAILED -- rejects in file oslo/messaging/_drivers/impl_zmq.py
Patch /tmp/x/build-area/oslo.messaging-1.4.1/debian/patches/zmq-server-routing.patch can be reverse-applied

review: Needs Fixing
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello Chuck,

I can merge/build this patch successfully.

niedbalski@theos-mobile:~/src/packages/foo$ bzr branch https://code.launchpad.net/~ubuntu-cloud-archive/ubuntu/trusty/oslo.messaging/juno
Branched 1 revision.
niedbalski@theos-mobile:~/src/packages/foo$ cd juno/
niedbalski@theos-mobile:~/src/packages/foo/juno$ bzr merge https://code.launchpad.net/~niedbalski/ubuntu/trusty/oslo.messaging/fix-lp-1338732
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 1.4.1.
+N debian/patches/0006-Declare-DirectPublisher-exchanges-with-passive-True.patch
 M debian/changelog
 M debian/patches/series
 M oslo/messaging/_drivers/amqpdriver.py
 M oslo/messaging/_drivers/common.py
 M oslo/messaging/_drivers/impl_qpid.py
 M oslo/messaging/_drivers/impl_rabbit.py
 M oslo/messaging/_drivers/impl_zmq.py
 M tests/drivers/test_impl_rabbit.py
 M tests/test_utils.py
All changes applied successfully.

Also the package is generated correctly using this patch.

dpkg-deb: building package `python-oslo.messaging' in `../python-oslo.messaging_1.4.1-0ubuntu1.1~cloud1_all.deb'.

2. By Jorge Niedbalski

Fix 1338732

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Zul,

Please, Could you recheck this proposal?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches