From 3837f8ccf791cae1f6abc10d20e0aa4ce99038f0 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Mon, 9 Sep 2013 00:38:42 +0200
Subject: [PATCH] remove runtime dep on python-pbr
---
bin/keystone-all | 3 +--
keystone/cli.py | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/bin/keystone-all b/bin/keystone-all
index 732ee8e..e548763 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -21,7 +21,6 @@ import sys
from oslo import i18n
from paste import deploy
-import pbr.version
# If ../keystone/__init__.py exists, add ../ to Python search path, so that
@@ -117,7 +116,7 @@ if __name__ == '__main__':
config.set_default_for_default_log_levels()
CONF(project='keystone',
- version=pbr.version.VersionInfo('keystone').version_string(),
+ version='REDHATKEYSTONEVERSION',
default_config_files=config_files)
config.setup_logging()
diff --git a/keystone/cli.py b/keystone/cli.py
index e8c84af..140832d 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -17,7 +17,6 @@ from __future__ import absolute_import
import os
from oslo.config import cfg
-import pbr.version
from keystone import assignment
from keystone.common import openssl
@@ -285,7 +284,7 @@ def main(argv=None, config_files=None):
CONF(args=argv[1:],
project='keystone',
- version=pbr.version.VersionInfo('keystone').version_string(),
+ version='REDHATKEYSTONEVERSION',
usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
default_config_files=config_files)
config.setup_logging()