Package: ftp.debian.org Severity: normal User: ftp.debian....@packages.debian.org Usertags: dak Tags: patch
Please consider the attached patch. Cheers, -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
From 482723d951ca6e877474d2c08ec777dc7b6c9cea Mon Sep 17 00:00:00 2001
From: James McCoy <james...@debian.org>
Date: Sun, 1 Dec 2013 20:29:15 -0500
Subject: [PATCH] dak/process_upload.py: handle an urgency with a comment
Policy allows a changes file's urgency to have a trailing comment
(separated by a space). If such a comment exists, the urgency needs to
be extracted so it is properly parsed. This ensures the urgency is
propagated properly.
Signed-off-by: James McCoy <james...@debian.org>
---
dak/process_upload.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dak/process_upload.py b/dak/process_upload.py
index 1518d26..797df4e 100755
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -273,6 +273,10 @@ def accept(directory, upload):
control = upload.changes.changes
if sourceful_upload and not Options['No-Action']:
urgency = control.get('Urgency')
+ # As per policy 5.6.17, the urgency can be followed by a space and a
+ # comment. Extract only the urgency from the string.
+ if ' ' in urgency:
+ (urgency, comment) = urgency.split(' ', 1)
if urgency not in cnf.value_list('Urgency::Valid'):
urgency = cnf['Urgency::Default']
UrgencyLog().log(control['Source'], control['Version'], urgency)
--
1.8.5.rc3
signature.asc
Description: Digital signature
