From 94220b145c6340fbfece511d8c45defef5a6c436 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Mon, 20 May 2013 15:02:11 -0500 Subject: [PATCH] Ensure that pbr>=0.5.10 is installed A bug in PBR levels less than 0.5.10 causes the /usr/lib/python2.X/site-packages/cinder/db/sqlalchemy/migrate_repo/migrate.cfg file to not be properly installed. This causes 'cinder-manage db sync' to fail due to the missing file. This change sets the required PBR level to >=0.5.10,<0.6 to avoid the problem. In the case that user already has a 0.5.X level of PBR installed that is less than 0.5.10 it should be updated rather than encountering issues as our test system did. Change-Id: I532158277a4acbb2f8cb75d03c91097e6d7e0312 fixes: bug 1182203 --- setup.py | 2 +- tools/pip-requires | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 1e9882df0ed..b3e85a7150c 100644 --- a/setup.py +++ b/setup.py @@ -17,5 +17,5 @@ import setuptools setuptools.setup( - setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'], + setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'], d2to1=True) diff --git a/tools/pip-requires b/tools/pip-requires index 3a2357c02b1..5caaa29bd6e 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,5 +1,5 @@ d2to1>=0.2.10,<0.3 -pbr>=0.5,<0.6 +pbr>=0.5.10,<0.6 amqplib>=0.6.1 anyjson>=0.2.4 argparse