X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=4e048d3ccccff4f90f827b47995d0d080684f5f1;hb=3d9c9fe2f794caa47f3bf4b7626f2c84108bf50e;hp=83b507a89062504b43840c51d257ea908757d82a;hpb=567c91b57f1e6af8da3e9e0ab5eeffa14796a256;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index 83b507a8..4e048d3c 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -42,6 +42,8 @@ re_taint_free = re.compile(r"^[-+~/\.\w]+$")
 
 re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>")
 
+re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$")
+
 changes_parse_error_exc = "Can't parse line in .changes file"
 invalid_dsc_format_exc = "Invalid .dsc file"
 nk_format_exc = "Unknown Format: in .changes file"
@@ -223,6 +225,14 @@ The rules for (signing_rules == 1)-mode are:
     changes_in.close()
     changes["filecontents"] = "".join(lines)
 
+    if changes.has_key("source"):
+        # Strip the source version in brackets from the source field,
+	# put it in the "source-version" field instead.
+        srcver = re_srchasver.search(changes["source"])
+	if srcver:
+            changes["source"] = srcver.group(1)
+	    changes["source-version"] = srcver.group(2)
+
     if error:
 	raise changes_parse_error_exc, error
 
@@ -608,7 +618,7 @@ argument:
 
     orig_filename = filename
     if filename.endswith(".dak"):
-        filename = filename[:-6]+".changes"
+        filename = filename[:-4]+".changes"
 
     if not filename.endswith(".changes"):
         error = "invalid file type; not a changes file"