Merge lp:~rvb/maas/fix-doc-link into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix links to changelog and documentation: the link should contain `docs<version>` and not `doc<version>`.

[Gavin Panella (allenap)]

Cool. One suggestion.

review: Approve

=== modified file 'src/maasserver/utils/tests/test_version.py'
--- src/maasserver/utils/tests/test_version.py	2015-03-03 16:09:08 +0000
+++ src/maasserver/utils/tests/test_version.py	2015-03-04 12:34:17 +0000
@@ -181,14 +181,14 @@
     def test__returns_doc_version_with_greater_than_1_decimals(self):
         mock_version = self.patch(version, "get_maas_main_version")
         mock_version.return_value = "1.8.0"
-        self.assertEquals("doc1.8", version.get_maas_doc_version())
+        self.assertEquals("docs1.8", version.get_maas_doc_version())
 
     def test__returns_doc_version_with_equal_to_1_decimals(self):
         mock_version = self.patch(version, "get_maas_main_version")
         mock_version.return_value = "1.8"
-        self.assertEquals("doc1.8", version.get_maas_doc_version())
+        self.assertEquals("docs1.8", version.get_maas_doc_version())
 
     def test__returns_just_doc_if_version_is_empty(self):
         mock_version = self.patch(version, "get_maas_main_version")
         mock_version.return_value = ""
-        self.assertEquals("doc", version.get_maas_doc_version())
+        self.assertEquals("docs", version.get_maas_doc_version())
 
=== modified file 'src/maasserver/utils/version.py'
--- src/maasserver/utils/version.py	2015-03-03 16:09:08 +0000
+++ src/maasserver/utils/version.py	2015-03-04 12:34:17 +0000
@@ -13,6 +13,8 @@
 
 __metaclass__ = type
 __all__ = [
+    "get_maas_doc_version",
+    "get_maas_version",
     ]
 
 import apt_pkg
@@ -70,7 +72,7 @@
     global MAAS_VERSION
     if MAAS_VERSION is None:
         MAAS_VERSION = get_version_from_apt(REGION_PACKAGE_NAME)
-        # Possible this returned an empty string, meaning its not installed
+        # Possibly this returned an empty string, meaning it's not installed
         # and no need to call again.
         if MAAS_VERSION:
             # It is a valid version so set the correct format.
@@ -121,9 +123,8 @@
 def get_maas_doc_version():
     """Return the doc version for the running MAAS region."""
     main_version = get_maas_main_version()
+    doc_prefix = 'docs'
     if not main_version:
-        return "doc"
-    if main_version.count('.') > 1:
-        return "doc%s" % '.'.join(main_version.split('.')[:2])
+        return doc_prefix
     else:
-        return "doc%s" % main_version
+        return doc_prefix + '.'.join(main_version.split('.')[:2])