← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/udev-is-no-longer-so-special into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/udev-is-no-longer-so-special/+merge/176209

Due to diffutils now having an option to not follow symlinks, we can stop treating udev as such a special little snowflake.
-- 
https://code.launchpad.net/~stevenk/launchpad/udev-is-no-longer-so-special/+merge/176209
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/udev-is-no-longer-so-special into lp:launchpad.
=== modified file 'lib/lp/soyuz/doc/package-diff.txt'
--- lib/lp/soyuz/doc/package-diff.txt	2013-01-08 07:54:50 +0000
+++ lib/lp/soyuz/doc/package-diff.txt	2013-07-22 14:28:03 +0000
@@ -674,33 +674,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-05-01 00:23:31 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2013-07-22 14:28:03 +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
@@ -576,19 +575,11 @@
                 "%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
         return PackageDiff(
             from_source=self, to_source=to_sourcepackagerelease,
-            requester=requester, status=status)
+            requester=requester)
 
     def aggregate_changelog(self, since_version):
         """See `ISourcePackagePublishingHistory`."""


Follow ups