Fix version detection when building docs.

Rewritten-From: a1e669328cd51cfd35b5e546b473869af102a5ef

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 4ad3d1825810233da8ae9f4b79387e033b591d9c..022298b46a7632dd81ae6bfd27f07c45ed48135c 100644 (file)
--- 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 <zigo@debian.org>  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 (file)
index 0000000..7d9cc22
--- /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 <zigo@debian.org>
+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 0646349f8662f36324b9b893c3f9c75501d74b9c..4aa2d4aa7dbdf76c774d4af00c80c7857f2e539f 100644 (file)
--- 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