Merge lp:~james-w/launchpad/sync-source-negative-versions into lp:launchpad

[James Westby]

Handle '0' correctly in version numbers when syncing new packages.

[James Westby (james-w)]

Fixes a problem found by geser with syncing new packages
that have odd version numbers.

A version can be 0~bzr123-1 or similar, which comapares
to less than 0. However, 0 was being used to mean "not
in Ubuntu," so sync-source.py considered the package to be
absent.

This change makes it use a proper sentinel, None, when
the package is new, so we can't get caught out by odd
comparisons.

Thanks,

James

[Graham Binns (gmb)]

This looks like a good change. r=me

review: Approve (code)

[Graham Binns (gmb)]

Hi James,

Can you link this branch to a bug? PQM gets upset if we don't supply a bug in the commit message.

=== modified file 'lib/lp/soyuz/scripts/tests/test_sync_source.py'
--- lib/lp/soyuz/scripts/tests/test_sync_source.py	2010-02-04 16:15:47 +0000
+++ lib/lp/soyuz/scripts/tests/test_sync_source.py	2010-03-03 13:52:23 +0000
@@ -301,7 +301,7 @@
         self.assertEqual(
             out.splitlines(),
             ['Getting binaries for hoary...',
-             '[Updating] bar (0 [Ubuntu] < 1.0-1 [Debian])',
+             '[Updating] bar (None [Ubuntu] < 1.0-1 [Debian])',
              ' * Trying to add bar...',
              ])
 
@@ -376,7 +376,7 @@
         self.assertEqual(
             out.splitlines(),
             ['Getting binaries for hoary...',
-             '[Updating] sample1 (0 [Ubuntu] < 1.0-1 [Debian])',
+             '[Updating] sample1 (None [Ubuntu] < 1.0-1 [Debian])',
              ' * Trying to add sample1...',
              ])
 

=== modified file 'scripts/ftpmaster-tools/sync-source.py'
--- scripts/ftpmaster-tools/sync-source.py	2010-02-11 16:51:14 +0000
+++ scripts/ftpmaster-tools/sync-source.py	2010-03-03 13:52:23 +0000
@@ -678,7 +678,7 @@
     packages.sort()
     for pkg in packages:
         stat_count += 1
-        dest_version = Suite.get(pkg, ["0", ""])[0]
+        dest_version = Suite.get(pkg, [None, ""])[0]
 
         if not Sources.has_key(pkg):
             if not Options.all:
@@ -694,8 +694,11 @@
             continue
 
         source_version = Sources[pkg]["version"]
-        if apt_pkg.VersionCompare(dest_version, source_version) < 0:
-            if  not Options.force and dest_version.find("ubuntu") != -1:
+        if (dest_version is None
+                or apt_pkg.VersionCompare(dest_version, source_version) < 0):
+            if (dest_version is not None
+                    and (not Options.force
+                        and dest_version.find("ubuntu") != -1)):
                 stat_cant_update += 1
                 print ("[NOT Updating - Modified] %s_%s (vs %s)"
                        % (pkg, dest_version, source_version))