merged from debian-sid, fix crash in Dsc file handling

2 files changed, 16 insertions, 2 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 05490da7..18c8642e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -78,8 +78,13 @@ except KeyError:
     release = p2.communicate()[0]
 
 # Handle the alpha release scheme
-release_raw = release.split("~")[0].split(".")[2]
-if release_raw.isdigit() and int(release_raw) >= 90:
+release_raw = "0"
+for c in release.split("~")[0].split(".")[2]:
+    if not c.isdigit():
+        break
+    release_raw += c
+    
+if 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
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
index dd958959..81dafd54 100644
--- a/doc/source/library/apt_pkg.rst
+++ b/doc/source/library/apt_pkg.rst
@@ -1381,6 +1381,10 @@ installation.
 
         The item is yet to be fetched.
 
+    .. attribute:: STAT_TRANSIENT_NETWORK_ERROR
+
+        There was a network error.
+
 
 .. class:: AcquireFile(owner, uri[, md5, size, descr, short_descr, destdir, destfile])
 
@@ -1824,6 +1828,11 @@ Configuration and Command-line parsing
 
         Remove the option at *key* and all of its children.
 
+    .. method:: dump() -> str
+
+        Return a string containing the values in the configuration object,
+        in the standard :manpage:`apt.conf(5)` format.
+
     .. method:: exists(key)
 
         Check whether an option named *key* exists in the configuration.