launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/changelog-formatting into lp:launchpad.

Commit message:
Fix gina- and archiveuploader-generated SPR.changelog_entry values to not be misformatted.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #628738 in Launchpad itself: "SourcePackageRelease.changelog_entry now incorrectly generated"
  https://bugs.launchpad.net/launchpad/+bug/628738
  Bug #827528 in Launchpad itself: "native-synced changelogs have spurious extra newline"
  https://bugs.launchpad.net/launchpad/+bug/827528

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/changelog-formatting/+merge/256898

Fix gina- and archiveuploader-generated SPR.changelog_entry values to not be misformatted.

There was an extra line, a missing line, and an extra space. All tested.

We should go back and fix old data at some point.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/changelog-formatting into lp:launchpad.

=== modified file 'lib/lp/archiveuploader/changesfile.py'
--- lib/lp/archiveuploader/changesfile.py	2013-06-26 06:57:30 +0000
+++ lib/lp/archiveuploader/changesfile.py	2015-04-21 10:07:59 +0000
@@ -356,7 +356,7 @@
         }}}
         """
         changes_author = (
-            '\n -- %s   %s' %
+            '\n\n -- %s  %s' %
             (self.changed_by['rfc822'], self.date))
         return self.changes_comment + changes_author
 

=== modified file 'lib/lp/archiveuploader/tests/nascentupload.txt'
--- lib/lp/archiveuploader/tests/nascentupload.txt	2014-10-31 07:00:29 +0000
+++ lib/lp/archiveuploader/tests/nascentupload.txt	2015-04-21 10:07:59 +0000
@@ -331,9 +331,13 @@
 Check if we have rebuid the change's author line properly (as
 mentioned in bug # 30621)
 
-    >>> print ed_spr.changelog_entry
+    >>> print ed_spr.changelog_entry #doctest: -NORMALIZE_WHITESPACE
     ed (0.2-20) unstable; urgency=low
+    <BLANKLINE>
+      * Move to dpatch; existing non-debian/ changes split into
     ...
+        Closes: #130327
+    <BLANKLINE>
      -- James Troup <james@xxxxxxxxxx>  Wed,  2 Apr 2003 17:19:47 +0100
 
 Some new fields required for NoMoreAptFtparchive implementation are

=== modified file 'lib/lp/archiveuploader/tests/test_changesfile.py'
--- lib/lp/archiveuploader/tests/test_changesfile.py	2013-08-07 06:26:36 +0000
+++ lib/lp/archiveuploader/tests/test_changesfile.py	2015-04-21 10:07:59 +0000
@@ -263,8 +263,8 @@
             "mypkg_0.1_i386.changes", contents)
         self.assertEquals([], list(changes.processAddresses()))
         self.assertEquals(
-            "Something changed\n"
-            " -- Somebody <somebody@xxxxxxxxxx>   "
+            "Something changed\n\n"
+            " -- Somebody <somebody@xxxxxxxxxx>  "
             "Fri, 25 Jun 2010 11:20:22 -0600",
             changes.simulated_changelog)
 

=== modified file 'lib/lp/soyuz/doc/gina.txt'
--- lib/lp/soyuz/doc/gina.txt	2015-04-20 09:48:57 +0000
+++ lib/lp/soyuz/doc/gina.txt	2015-04-21 10:07:59 +0000
@@ -219,7 +219,6 @@
     >>> print x11p.changelog_entry #doctest: -NORMALIZE_WHITESPACE
     x11proto-damage (6.8.99.7-2) breezy; urgency=low
     <BLANKLINE>
-    <BLANKLINE>
       * Add dependency on x11proto-fixes-dev.
     <BLANKLINE>
      -- Daniel Stone <daniel.stone@xxxxxxxxxx>  Mon, 11 Jul 2005 19:11:11 +1000

=== modified file 'lib/lp/soyuz/scripts/gina/changelog.py'
--- lib/lp/soyuz/scripts/gina/changelog.py	2011-07-29 12:22:17 +0000
+++ lib/lp/soyuz/scripts/gina/changelog.py	2015-04-21 10:07:59 +0000
@@ -72,7 +72,7 @@
                 #print "state0 Exception skip"
                 continue
             firstline = line.strip()
-            stanza = [line, '\n', '\n']
+            stanza = [line, '\n']
             state = 1
             continue