Merge lp:~stevenk/launchpad/udev-is-no-longer-so-special into lp:launchpad

[Steve Kowalik]

Due to diffutils now having an option to not follow symlinks, we can stop treating udev as such a special little snowflake.

[lp:~stevenk/launchpad/udev-is-no-longer-so-special]

16701. By Steve Kowalik on 2013-08-01

Merge devel, resolving conflicts.

Unmerged revisions

16701. By Steve Kowalik on 2013-08-01

Merge devel, resolving conflicts.

16700. By Steve Kowalik on 2013-07-22

udev is no longer special cased in the packagediff generation code.

=== modified file 'lib/lp/soyuz/doc/package-diff.txt'
--- lib/lp/soyuz/doc/package-diff.txt	2013-07-31 00:37:32 +0000
+++ lib/lp/soyuz/doc/package-diff.txt	2013-08-01 00:33:26 +0000
@@ -649,33 +649,6 @@
     None
 
 
-Problematic packages
---------------------
-
-XXX 2009-11-23 Julian bug=314436
-Because of bug 314436, diffs of udev can generate huge output which fills the
-disk very quickly.  For that reason, diffs of udev are created FAILED by
-default, which will stop the diff script from attempting to create the diff.
-
-    >>> from lp.soyuz.enums import PackagePublishingStatus
-    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
-    >>> stp = SoyuzTestPublisher()
-    >>> discard = stp.setUpDefaultDistroSeries(hoary)
-    >>> udev_orig = stp.getPubSource(
-    ...     sourcename="udev", version="1.0",
-    ...     status=PackagePublishingStatus.PUBLISHED)
-    >>> udev_new = stp.getPubSource(
-    ...     sourcename="udev", version="1.1",
-    ...     status=PackagePublishingStatus.PENDING)
-
-    >>> udev_diff = udev_orig.sourcepackagerelease.requestDiffTo(
-    ...     requester=cprov,
-    ...     to_sourcepackagerelease=udev_new.sourcepackagerelease)
-
-    >>> print udev_diff.status.name
-    FAILED
-
-
 PackageDiff privacy
 -------------------
 

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2013-07-04 05:59:33 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2013-08-01 00:33:26 +0000
@@ -64,7 +64,6 @@
     cachedproperty,
     get_property_cache,
     )
-from lp.soyuz.enums import PackageDiffStatus
 from lp.soyuz.interfaces.archive import MAIN_ARCHIVE_PURPOSES
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.packagediff import PackageDiffAlreadyRequested
@@ -577,21 +576,12 @@
                 "%s was already requested by %s"
                 % (candidate.title, candidate.requester.displayname))
 
-        if self.sourcepackagename.name == 'udev':
-            # XXX 2009-11-23 Julian bug=314436
-            # Currently diff output for udev will fill disks.  It's
-            # disabled until diffutils is fixed in that bug.
-            status = PackageDiffStatus.FAILED
-        else:
-            status = PackageDiffStatus.PENDING
-
         Store.of(to_sourcepackagerelease).flush()
         del get_property_cache(to_sourcepackagerelease).package_diffs
         packagediff = PackageDiff(
             from_source=self, to_source=to_sourcepackagerelease,
-            requester=requester, status=status)
-        if status == PackageDiffStatus.PENDING:
-            getUtility(IPackageDiffJobSource).create(packagediff)
+            requester=requester)
+        getUtility(IPackageDiffJobSource).create(packagediff)
         return packagediff
 
     def aggregate_changelog(self, since_version):