From 28d8d7eff16a0966bf6bbd8b4b2ee14fe0d0d846 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 16 May 2013 14:03:05 +0000 Subject: [PATCH] Fix version detection when building docs. Rewritten-From: a1e669328cd51cfd35b5e546b473869af102a5ef --- trusty/debian/changelog | 1 + ...-version-detection-when-building-doc.patch | 27 +++++++++++++++++++ trusty/debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 trusty/debian/patches/fix-package-version-detection-when-building-doc.patch diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 4ad3d182..022298b4 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -2,6 +2,7 @@ heat (2013.1-2) unstable; urgency=low * Uploading to unstable. * Removes the <=2.3.5 from python-lxml requirements. + * Fix package version detection when building docs. -- Thomas Goirand Thu, 16 May 2013 13:15:54 +0000 diff --git a/trusty/debian/patches/fix-package-version-detection-when-building-doc.patch b/trusty/debian/patches/fix-package-version-detection-when-building-doc.patch new file mode 100644 index 00000000..7d9cc221 --- /dev/null +++ b/trusty/debian/patches/fix-package-version-detection-when-building-doc.patch @@ -0,0 +1,27 @@ +Description: Fixes version detection when building docs +Author: Thomas Goirand +Forwarded: no +Last-Update: 2013-05-16 + +Index: heat/heat/openstack/common/version.py +=================================================================== +--- heat.orig/heat/openstack/common/version.py 2013-05-16 14:07:08.000000000 +0000 ++++ heat/heat/openstack/common/version.py 2013-05-16 14:07:08.000000000 +0000 +@@ -19,6 +19,7 @@ + """ + + import pkg_resources ++import os + + + class VersionInfo(object): +@@ -54,6 +55,9 @@ + if self.release is None: + self.release = self._get_version_from_pkg_resources() + ++ if self.release is None: ++ self.release = os.environ.get("OSLO_PACKAGE_VERSION", None) ++ + return self.release + + def version_string(self): diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 0646349f..4aa2d4aa 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1 +1,2 @@ removes-lxml-version-limitation-from-pip-requires.patch +fix-package-version-detection-when-building-doc.patch -- 2.45.2