summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/source/conf.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ae937e41..44ee3c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ python-apt (0.7.95ubuntu1) UNRELEASEDmaverick; urgency=low
* data/templates/gNewSense.info.in,
data/templates/gNewSense.mirrors:
- add gNewSense template and mirrors, thanks to Karl Goetz
+ * doc/source/conf.py:
+ - do not fail for non digit version numbers like 0.7.95ubuntu1
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 01 Jun 2010 17:06:49 +0200
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5f82d5eb..05490da7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -78,7 +78,8 @@ except KeyError:
release = p2.communicate()[0]
# Handle the alpha release scheme
-if int(release.split("~")[0].split(".")[2]) >= 90:
+release_raw = release.split("~")[0].split(".")[2]
+if release_raw.isdigit() and int(release_raw) >= 90:
version_s = release.split("~")[0].split(".")[:3]
# Set the version to 0.X.100 if the release is 0.X.9Y (0.7.90 => 0.7.100)
# Use
@@ -90,6 +91,7 @@ if int(release.split("~")[0].split(".")[2]) >= 90:
del version_s
else:
version = '.'.join(release.split("~")[0].split('.')[:3])
+del release_raw
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.