Ubuntu
nova package

Merge lp:~gandelman-a/ubuntu/saucy/nova/pbr_d2to1_versions into lp:~ubuntu-server-dev/nova/havana

  1. Saucy (13.10)
  2. pbr_d2to1_versions
  3. Merge into havana
Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 583
Merged at revision: 583
Proposed branch: lp:~gandelman-a/ubuntu/saucy/nova/pbr_d2to1_versions
Merge into: lp:~ubuntu-server-dev/nova/havana
Diff against target: 36 lines (+6/-2)
2 files modified
debian/changelog (+4/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/nova/pbr_d2to1_versions
Reviewer Review Type Date Requested Status
Chuck Short (community) Needs Fixing
Review via email: mp+170365@code.launchpad.net

This proposal supersedes a proposal from 2013-06-15.

Description of the change

Drops the patch that sets version requirements in setup.py. Moves to d/control and sets pbr dependency to meet 0.5.11, which nova at least now requires, or it will fail:

2013-06-14 23:52:18,438: hook.output@INFO: Traceback (most recent call last):
  File "/usr/bin/nova-manage", line 5, in <module>
    from pkg_resources import load_entry_point
  File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2711, in <module>

2013-06-14 23:52:18,438: hook.output@INFO: parse_requirements(__requires__), Environment()
  File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 588, in resolve

2013-06-14 23:52:18,438: hook.output@INFO: raise VersionConflict(dist,req) # XXX put more info here
pkg_resources.VersionConflict: (pbr 0.5.11 (/usr/lib/python2.7/dist-packages), Requirement.parse('pbr>=0.5.16,<0.6'))

2013-06-14 23:52:18,445: hook.output@INFO: dpkg: error processing nova-common (--configure):

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

You have a merge conflict in the debian/changelog.

review: Needs Fixing
lp:~gandelman-a/ubuntu/saucy/nova/pbr_d2to1_versions updated
583. By Adam Gandelman

Fix changelog conflict.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-17 12:09:23 +0000
3+++ debian/changelog 2013-06-19 17:18:26 +0000
4@@ -6,6 +6,10 @@
5 [Yolanda Robla]
6 * debian/tests: added autopkgtests
7
8+ [ Adam Gandelman ]
9+ * debian/control: Set version requirements python-pbr (>= 0.5.11),
10+ python-d2to1 (>= 0.2.10).
11+
12 -- Chuck Short <zulcss@ubuntu.com> Mon, 03 Jun 2013 08:52:36 -0500
13
14 nova (1:2013.2~b1-0ubuntu1) saucy; urgency=low
15
16=== modified file 'debian/control'
17--- debian/control 2013-06-03 13:49:25 +0000
18+++ debian/control 2013-06-19 17:18:26 +0000
19@@ -17,7 +17,7 @@
20 python-cinderclient,
21 python-coverage,
22 python-crypto,
23- python-d2to1,
24+ python-d2to1 (>= 0.2.10),
25 python-distutils-extra,
26 python-eventlet,
27 python-fixtures (>= 0.3.12),
28@@ -34,7 +34,7 @@
29 python-paramiko,
30 python-paste,
31 python-pastedeploy (>= 1.5.0),
32- python-pbr,
33+ python-pbr (>= 0.5.11),
34 python-pyasn1,
35 python-quantumclient,
36 python-routes,

Subscribers

People subscribed via source and target branches