Merge lp:~ajmitch/launchpad/fakesyncs into lp:launchpad

[Andrew Mitchell]

Summary:
Packages that have been uploaded to Ubuntu & then subsequently uploaded to Debian with a different orig.tar.gz cannot be synced, and a convention is to 'fakesync' these packages with a -XbuildY or XubuntuY revision. Using the former means that sync-source.py will fail at importing them, and the latter means that they will not be automatically synced when a new upstream version is released.

Proposed fix:
This branch adds a special case for packages with a version string containing 'fakesync', such that it will not sync the package if the Ubuntu & Debian upstream versions are the same, and the version contains fakesync

[Māris Fogels (mars)]

Hi Andrew,

The branch structure is really difficult to follow. Before landing this I think you have to make absolutely sure that no execution paths have changed. The fact that these scripts often don't have tests does not help the matter: we have to lean even more on code inspection.

Did you have a pre-implementation call with anyone? And are there any tests that can be run to verify the change?

Maris

review: Needs Information

[Andrew Mitchell (ajmitch)]

Having read a thread which I've dug up about this subject ( http://thread.gmane.org/gmane.linux.ubuntu.devel/30305/focus=30318 ), I'm not convinced that the proposed merge, which introduces a new special-case in the version handling, is the best way I could do this. I'll take a look at the possibility of checking the md5sums of the original tarballs instead of checking the version.

Unmerged revisions

10992. By Andrew Mitchell on 2010-06-10

Refuse to try & sync packages with fakesync in the version when they have the same upstream version

=== modified file 'scripts/ftpmaster-tools/sync-source.py'
--- scripts/ftpmaster-tools/sync-source.py	2010-05-19 18:07:56 +0000
+++ scripts/ftpmaster-tools/sync-source.py	2010-06-15 11:34:39 +0000
@@ -698,12 +698,20 @@
         source_version = Sources[pkg]["version"]
         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))
+            if dest_version is not None:
+                if (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))
+                elif (not Options.force
+                      and dest_version.find("fakesync") != -1
+                      and (apt_pkg.upstream_version(dest_version) == 
+                           apt_pkg.upstream_version(source_version))):
+                    # fakesyncs cannot sync if upstream versions are the same
+                    stat_cant_update += 1
+                    print ("[NOT Updating - Fakesync] %s_%s (vs %s)"
+                           % (pkg, dest_version, source_version))
             else:
                 stat_updated += 1
                 print ("[Updating] %s (%s [Ubuntu] < %s [%s])"