From 95f764499402466edbe1528307da8fa92ee2215b Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Tue, 17 Jan 2012 07:29:23 -0600 Subject: [PATCH] Fixes setup scripts for quantum plugins. Fixes bug 917630. Change-Id: I3cf66acf46bcfc83755b572756896032cb6a11d1 --- setup_cisco_plugin.py | 4 ++-- setup_client.py | 4 ++-- setup_common.py | 4 ++-- setup_openvswitch_plugin.py | 4 ++-- setup_sample_plugin.py | 4 ++-- setup_server.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/setup_cisco_plugin.py b/setup_cisco_plugin.py index a7961138fa8..2bf6eb32dae 100644 --- a/setup_cisco_plugin.py +++ b/setup_cisco_plugin.py @@ -6,11 +6,11 @@ except ImportError: from setuptools import setup, find_packages import sys -import version +from quantum import version Name = 'quantum-cisco-plugin' ProjecUrl = "" -Version = version.get_git_version() +Version = version.version_string() License = 'Apache License 2.0' Author = 'Cisco Systems' AuthorEmail = '' diff --git a/setup_client.py b/setup_client.py index 8a39e0932bd..1eab791507d 100644 --- a/setup_client.py +++ b/setup_client.py @@ -5,11 +5,11 @@ except ImportError: use_setuptools() from setuptools import setup, find_packages -import version +from quantum import version Name = 'quantum-client' Url = "https://launchpad.net/quantum" -Version = version.get_git_version() +Version = version.version_string() License = 'Apache License 2.0' Author = 'Netstack' AuthorEmail = 'netstack@lists.launchpad.net' diff --git a/setup_common.py b/setup_common.py index 3f39b374467..2313c15581a 100644 --- a/setup_common.py +++ b/setup_common.py @@ -5,11 +5,11 @@ except ImportError: use_setuptools() from setuptools import setup, find_packages -import version +from quantum import version Name = 'quantum-common' Url = "https://launchpad.net/quantum" -Version = version.get_git_version() +Version = version.version_string() License = 'Apache License 2.0' Author = 'Netstack' AuthorEmail = 'netstack@lists.launchpad.net' diff --git a/setup_openvswitch_plugin.py b/setup_openvswitch_plugin.py index bdaeb0ce15e..54b1a10d2ea 100644 --- a/setup_openvswitch_plugin.py +++ b/setup_openvswitch_plugin.py @@ -5,13 +5,13 @@ except ImportError: use_setuptools() from setuptools import setup, find_packages -import version +from quantum import version import sys Name = 'quantum-openvswitch-plugin' ProjecUrl = "" -Version = version.get_git_version() +Version = version.version_string() License = 'Apache License 2.0' Author = 'Open vSwitch Team' AuthorEmail = 'discuss@openvswitch.org' diff --git a/setup_sample_plugin.py b/setup_sample_plugin.py index e3e345eb993..3379c67e136 100644 --- a/setup_sample_plugin.py +++ b/setup_sample_plugin.py @@ -5,13 +5,13 @@ except ImportError: use_setuptools() from setuptools import setup, find_packages -import version +from quantum import version import sys Name = 'quantum-sample-plugin' Summary = 'Sample plugin for Quantum' Url = "https://launchpad.net/quantum" -Version = version.get_git_version() +Version = version.version_string() License = 'Apache License 2.0' Author = 'Netstack' AuthorEmail = 'netstack@lists.launchpad.net' diff --git a/setup_server.py b/setup_server.py index ad9e5ac767c..563e3c815d9 100644 --- a/setup_server.py +++ b/setup_server.py @@ -7,11 +7,11 @@ except ImportError: import os import sys -import version +from quantum import version Name = 'quantum-server' Url = "https://launchpad.net/quantum" -Version = version.get_git_version() +Version = version.version_string() License = 'Apache License 2.0' Author = 'Netstatck' AuthorEmail = 'netstack@lists.launchpad.net'