Merge lp:~cjwatson/launchpad/sync-source-section-priority-581697 into lp:launchpad

[Colin Watson]

If Section or Priority is missing from the Source stanza of debian/control, leave it as "-" in the generated .changes file rather than setting it to "None".

If Section or Priority is missing from the Source stanza of debian/control, leave it as "-" in the generated .changes file rather than setting it to "None".

Fixes bug 581697.

I haven't included any tests as sync-source.py in general is untested, and in any case is due to be replaced eventually with API calls which I don't think should have this problem. Test case is in the bug, reproducible with 'sync-source.py -S unstable bglibs' as the lp_archive user on cocoplum with ~lp_archive/syncs/ as the current directory (or another Soyuz instance that has Debian_unstable_main_Sources in the current directory as a gunzipped copy of http://ftp.debian.org/debian/dists/unstable/main/source/Sources.gz).

[Julian Edwards (julian-edwards)]

Thanks for the fix Colin. I'll land this with a small style tweak as it's LP style to not compare for None like that, we do an explicit check. Your code then becomes:

if section is not None:
    source_section = section

for example.

review: Approve

[Colin Watson (cjwatson)]

In that case there are two other instances of the same comparison style in that function that should be changed in the same way ('if source' and 'if package').

=== modified file 'scripts/ftpmaster-tools/sync-source.py'
--- scripts/ftpmaster-tools/sync-source.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/sync-source.py	2010-05-17 13:47:29 +0000
@@ -267,8 +267,10 @@
         priority = Control.Section.Find("Priority")
         description = Control.Section.Find("Description")
         if source:
-            source_section = section
-            source_priority = priority
+            if section:
+                source_section = section
+            if priority:
+                source_priority = priority
             source_name = source
         if package and package == source_name:
             source_description = (