Merge lp:~jelmer/launchpad/635591-sync-source-unicode into lp:launchpad

[Jelmer Vernooij]

Fix handling of empty lines in sync source (regression from fix for bug 635591).

I found an issue with my fix for bug 635591 when I QA'ed it.

If the changelog entry contains white lines then no new fields will be parsed. Since the Files section was added after the Changes section this meant that the Files section would be ignored in some cases.

This branch adds a test for changelog entries with empty lines and moves the Files section up in the file to cope with this bug.

[Jelmer Vernooij (jelmer)]

FWIW, I'm also filing a bug against python-debian about this issue.

[Robert Collins (lifeless)]

Something is funny with the bug/branch info here; the older MP isn't linked, the bug isn't qa-bad or qa-needstesting marked. Could you please put a bug together for why the older MP wasn't linked from the branch anymore?

review: Approve

[Jelmer Vernooij (jelmer)]

On Thu, 2010-09-16 at 19:08 +0000, Robert Collins wrote:
> Something is funny with the bug/branch info here; the older MP isn't
> linked, the bug isn't qa-bad or qa-needstesting marked. Could you
> please put a bug together for why the older MP wasn't linked from the
> branch anymore?
I think the qa-needstesting wasn't there because I QA'ed it on dogfood
very quickly after it landed on devel, the QA bot probably just hadn't
run yet in that time period.

Bug 640810 has been filed about the missing link to the older MP on the
branch page.

Cheers,

Jelmer

=== modified file 'lib/lp/soyuz/scripts/ftpmaster.py'
--- lib/lp/soyuz/scripts/ftpmaster.py	2010-09-16 11:14:42 +0000
+++ lib/lp/soyuz/scripts/ftpmaster.py	2010-09-16 19:02:52 +0000
@@ -1464,7 +1464,6 @@
         changes["Closes"] = " ".join(closes)
     if lp_closes:
         changes["Launchpad-bugs-fixed"] = " ".join(lp_closes)
-    changes["Changes"] = "\n%s" % changelog
     files = []
     for filename in dsc_files:
         if filename in files_from_librarian:
@@ -1477,4 +1476,5 @@
                      })
 
     changes["Files"] = files
+    changes["Changes"] = "\n%s" % changelog
     return changes

=== modified file 'lib/lp/soyuz/scripts/tests/test_sync_source.py'
--- lib/lp/soyuz/scripts/tests/test_sync_source.py	2010-09-16 11:35:26 +0000
+++ lib/lp/soyuz/scripts/tests/test_sync_source.py	2010-09-16 19:02:52 +0000
@@ -5,7 +5,9 @@
 
 __metaclass__ = type
 
+from cStringIO import StringIO
 from debian.deb822 import (
+    Changes,
     Deb822Dict,
     Dsc,
     )
@@ -507,6 +509,30 @@
         self.assertIn(
             "Updated French translation by J\xc3\xa9lmer.", contents)
 
+    def test_changelog_whitelines(self):
+        # The changelog entry can contain empty lines, and this should not
+        # mess up the parsing of the changes file.
+        changelog = "* Foo\n\n\n* Bar\n.\nEntries"
+        changes = self.generateChanges(changelog=changelog)
+        contents = changes.dump(encoding="utf-8").encode("utf-8")
+        # Read contents back
+        read_changes = Changes(contents)
+        self.assertEquals("\n%s" % changelog, changes['Changes'])
+        self.assertContentEqual([
+            'Architecture',
+            'Binary',
+            'Changed-By',
+            'Changes',
+            'Date',
+            'Distribution',
+            'Files',
+            'Format',
+            'Maintainer',
+            'Origin',
+            'Source',
+            'Urgency',
+            'Version',
+            ], read_changes.keys())
 
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)