Launchpad itself

Merge lp:~wgrant/launchpad/distroseries-source-format-selection-part1 into lp:launchpad

distroseries-source-format-selection-part1
Merge into devel

Proposed by William Grant on 2009-11-11

Status:	Merged
Approved by:	Julian Edwards on 2009-11-14
Approved revision:	not available
Merge reported by:	William Grant
Merged at revision:	not available
Proposed branch:	lp:~wgrant/launchpad/distroseries-source-format-selection-part1
Merge into:	lp:launchpad
Diff against target:	4589 lines
To merge this branch:	bzr merge lp:~wgrant/launchpad/distroseries-source-format-selection-part1
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)	code	2009-11-11	Approve on 2009-11-14
Gavin Panella (community)			Approve on 2009-11-11
Review via email: mp+14729@code.launchpad.net

Commit message

Refactor bits and pieces to prepare for Debian source format 3.0 support.

Revision history for this message

William Grant (wgrant) wrote on 2009-11-11:

This is hopefully the second last of my Debian source format 3.0 branches. It has minimal 3.0-specific changes, as it mainly refactoring to support the new file types and multiple formats.

Note that the sample data changes are all from schema changes in previous branches, with the exception of the 'INSERT INTO sourcepackageformatselection' lines which are new (they permit the 1.0 format in all series in the sample data).

The main changes are:

Making way for new files (new compression algorithms and completely new file types):
- Renamed SourcePackageFileType.ORIG to ORIG_TARBALL, and SPFT.TARBALL to NATIVE_TARBALL, as there will be other kinds of orig and tarball soon.
- Isolated extension matching on source files into determine_source_file_type.

Adding multiple source format support to archiveuploader:
- Removed most of the checks from NU._check_binaryful_consistency, since we cannot make many assertions until we know the DSC format.
- Extended DSCFile.checkFiles to perform the checks that NU._check_binaryful_consistency used have, but in a more extensible manner.

Forbidding uploads and copies of sources to series without appropriate format support:
- Added the SourcePackageFormat enum with 1.0, 3.0 (quilt) and 3.0 (native) formats.
- Added (I)SourcePackageFormatSelection, which uses a DB table added late in 3.1.10.
- Added DB permissions for SPFS.
- Added (I)DistroSeries.{permitSourcePackageFormat,isSourceFormatPermitted} to allow manipulation and verification of allowed formats.
- Extended DS._copy_component_and_section_selections to also copy SourcePackageFormatSelections during intialiseFromParent.
- In CopyChecker.checkCopy, reject a copy if the target does not support the source format.
- Replace the self.format != "1.0" check in archiveuploader with a check that the format is supported by the target series.

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2009-11-11:

Hi William, thanks for making this change. There's some much-needed refactoring and clearing up in nascentupload.

The basic direction is good, I just have a few comments to make for things that need fixing. Gavin will do a more thorough review as we agreed on IRC.

General questions:

* I can't tell from the diff but are the db permissions added for the new table correctly tested in the tests? This usually just means ensuring that the test runs as the correct db user.
* The XXX about the orphaned files is interesting. I don't think we deal with this right now do we? I'm trying to think if it would be bad to reject the upload if we detect orphan files, and I can't think of one. What's your opinion?

Things that need fixing:

* The upload format check is not tested. (The "%s: format '%s' is not permitted in %s." one)

* IDistroSeries methods permitSourcePackageFormat() and isSourcePackageFormatPermitted() should be in a utility, e.g. SourcePackageFormatSet. This ensures that in a zopeful environment they are security wrapped. Although the upload processor is zopeless, we might need to do that one day. Something like
   * SourcePackageFormatSet.add()
   * SourcePackageFormatSet.getByFormat()
   would fit with our current style. You can keep the isSourcePackageFormatPermitted() and make it call the utility method as a convenience, but the permitSourcePackageFormat() should go.

* Once that's done, you should remove the __init__ on the SourcePackageFormat model class and make the new utility's add() method initialise the correct fields.

Everything else looks great, thanks!

review: Needs Fixing

Revision history for this message

Gavin Panella (allenap) wrote on 2009-11-11:

Download full text (34.9 KiB)

Hi William,

As Julian has already reviewed the logic in this branch, I'll just do
a style/convention review.

I really have very little to say, and that which I have said is pretty
trivial. It's inline with the diff below.

Running `make lint` generated a lot of warnings. Please can you clean
up those that make sense.

Thanks, Gavin.

> === modified file 'database/schema/security.cfg'
> --- database/schema/security.cfg 2009-11-06 01:16:21 +0000
> +++ database/schema/security.cfg 2009-11-11 14:24:18 +0000
> @@ -271,6 +271,7 @@
> public.shippingrun = SELECT, INSERT, UPDATE
> public.sourcepackagepublishinghistory = SELECT
> public.seriessourcepackagebranch = SELECT, INSERT, UPDATE, DELETE
> +public.sourcepackageformatselection = SELECT
> public.specificationbranch = SELECT, INSERT, UPDATE, DELETE
> public.specificationbug = SELECT, INSERT, DELETE
> public.specificationdependency = SELECT, INSERT, DELETE
> @@ -986,6 +987,7 @@
> public.section = SELECT, INSERT, UPDATE
> public.sectionselection = SELECT, INSERT, UPDATE
> public.signedcodeofconduct = SELECT, INSERT, UPDATE
> +public.sourcepackageformatselection = SELECT, INSERT

This should go after the following line. Wow, how pedantic I am :)

Hi William,

As Julian has already reviewed the logic in this branch, I'll just do
a style/convention review.

I really have very little to say, and that which I have said is pretty
trivial. It's inline with the diff below.

Running `make lint` generated a lot of warnings. Please can you clean
up those that make sense.

Thanks, Gavin.

> === modified file 'database/schema/security.cfg'
> --- database/schema/security.cfg	2009-11-06 01:16:21 +0000
> +++ database/schema/security.cfg	2009-11-11 14:24:18 +0000
> @@ -271,6 +271,7 @@
>  public.shippingrun                      = SELECT, INSERT, UPDATE
>  public.sourcepackagepublishinghistory   = SELECT
>  public.seriessourcepackagebranch        = SELECT, INSERT, UPDATE, DELETE
> +public.sourcepackageformatselection     = SELECT
>  public.specificationbranch              = SELECT, INSERT, UPDATE, DELETE
>  public.specificationbug                 = SELECT, INSERT, DELETE
>  public.specificationdependency          = SELECT, INSERT, DELETE
> @@ -986,6 +987,7 @@
>  public.section                          = SELECT, INSERT, UPDATE
>  public.sectionselection                 = SELECT, INSERT, UPDATE
>  public.signedcodeofconduct              = SELECT, INSERT, UPDATE
> +public.sourcepackageformatselection     = SELECT, INSERT

This should go after the following line. Wow, how pedantic I am :)

>  public.sourcepackagefilepublishing      = SELECT, INSERT, UPDATE
>  public.sourcepackagename                = SELECT, INSERT, UPDATE
>  public.sourcepackagepublishinghistory   = SELECT
> @@ -1103,6 +1105,7 @@
>  public.archivepermission                = SELECT
>  public.processor                        = SELECT
>  public.processorfamily                  = SELECT
> +public.sourcepackageformatselection     = SELECT
>
>  # Source and Binary packages and builds
>  public.sourcepackagename                = SELECT, INSERT
>
> === modified file 'lib/canonical/launchpad/helpers.py'
> --- lib/canonical/launchpad/helpers.py	2009-07-17 00:26:05 +0000
> +++ lib/canonical/launchpad/helpers.py	2009-11-11 14:24:18 +0000
> @@ -477,9 +477,9 @@
>      if fname.endswith(".diff.gz"):
>          return SourcePackageFileType.DIFF
>      if fname.endswith(".orig.tar.gz"):
> -        return SourcePackageFileType.ORIG
> +        return SourcePackageFileType.ORIG_TARBALL
>      if fname.endswith(".tar.gz"):
> -        return SourcePackageFileType.TARBALL
> +        return SourcePackageFileType.NATIVE_TARBALL
>
>
>  BINARYPACKAGE_EXTENSIONS = {
>
> === modified file 'lib/lp/archiveuploader/dscfile.py'
> --- lib/lp/archiveuploader/dscfile.py	2009-06-24 23:33:29 +0000
> +++ lib/lp/archiveuploader/dscfile.py	2009-11-11 14:24:18 +0000
> @@ -31,10 +31,13 @@
>      parse_tagfile, TagFileParseError)
>  from lp.archiveuploader.utils import (
>      prefix_multi_line_string, safe_fix_maintainer, ParseMaintError,
> -    re_valid_pkg_name, re_valid_version, re_issource)
> +    re_valid_pkg_name, re_valid_version, re_issource,
> +    determine_source_file_type)
>  from canonical.encoding import guess as guess_encoding
>  from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
> +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
>  from lp.soyuz.interfaces.archive import ArchivePurpose
> +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
>  from canonical.launchpad.interfaces import (
>      GPGVerificationError, IGPGHandler, IGPGKeySet,
>      ISourcePackageNameSet, NotFoundError)
> @@ -228,6 +231,9 @@
>          This method is an error generator, i.e, it returns an iterator over all
>          exceptions that are generated while processing DSC file checks.
>          """
> +        # Avoid circular imports.
> +        from lp.archiveuploader.nascentupload import EarlyReturnUploadError
> +
>          for error in SourceUploadFile.verify(self):
>              yield error
>
> @@ -265,10 +271,17 @@
>              yield UploadError(
>                  "%s: invalid version %s" % (self.filename, self.dsc_version))
>
> -        if self.format != "1.0":
> +        try:
> +            format_term = SourcePackageFormat.getTermByToken(self.format)
> +        except LookupError:
> +            raise EarlyReturnUploadError(
> +                "Unsupported source format: %s" % self.format)
> +
> +        if not self.policy.distroseries.isSourcePackageFormatPermitted(
> +            format_term.value):
>              yield UploadError(
> -                "%s: Format is not 1.0. This is incompatible with "
> -                "dpkg-source." % self.filename)
> +                "%s: format '%s' is not permitted in %s." %
> +                (self.filename, self.format, self.policy.distroseries.name))
>
>          # Validate the build dependencies
>          for field_name in ['build-depends', 'build-depends-indep']:
> @@ -324,7 +337,8 @@
>          :raise: `NotFoundError` when the wanted file could not be found.
>          """
>          if (self.policy.archive.purpose == ArchivePurpose.PPA and
> -            filename.endswith('.orig.tar.gz')):
> +            determine_source_file_type(filename) ==
> +                SourcePackageFileType.ORIG_TARBALL):
>              archives = [self.policy.archive, self.policy.distro.main_archive]
>          else:
>              archives = [self.policy.archive]
> @@ -348,11 +362,25 @@
>          We don't use the NascentUploadFile.verify here, only verify size
>          and checksum.
>          """
> -        has_tar = False
> +
> +        diff_count = 0
> +        orig_tar_count = 0
> +        native_tar_count = 0
> +
>          files_missing = False
>          for sub_dsc_file in self.files:
> -            if sub_dsc_file.filename.endswith("tar.gz"):
> -                has_tar = True
> +            filetype = determine_source_file_type(sub_dsc_file.filename)
> +
> +            if filetype == SourcePackageFileType.DIFF:
> +                diff_count += 1
> +            elif filetype == SourcePackageFileType.ORIG_TARBALL:
> +                orig_tar_count += 1
> +            elif filetype == SourcePackageFileType.NATIVE_TARBALL:
> +                native_tar_count += 1
> +            else:
> +                yield UploadError('Unknown file: ' + sub_dsc_file.filename)
> +                continue
> +
>              try:
>                  library_file, file_archive = self._getFileByName(
>                      sub_dsc_file.filename)
> @@ -397,11 +425,37 @@
>                  yield error
>                  files_missing = True
>
> -
> -        if not has_tar:
> -            yield UploadError(
> -                "%s: does not mention any tar.gz or orig.tar.gz."
> -                % self.filename)
> +        # Reject if we have more than one file of any type.
> +        if orig_tar_count > 1:
> +            yield UploadError(
> +                "%s: has more than one orig.tar.*."
> +                % self.filename)
> +        if native_tar_count > 1:
> +            yield UploadError(
> +                "%s: has more than one tar.*."
> +                % self.filename)
> +        if diff_count > 1:
> +            yield UploadError(
> +                "%s: has more than one diff.gz."
> +                % self.filename)
> +
> +        if ((orig_tar_count == 0 and native_tar_count == 0) or
> +            (orig_tar_count > 0 and native_tar_count > 0)):
> +            yield UploadError(
> +                "%s: must have exactly one tar.* or orig.tar.*."
> +                % self.filename)
> +
> +        # Format 1.0 must be native (exactly one tar.gz), or
> +        # have an orig.tar.gz and a diff.gz. It cannot have
> +        # compression types other than 'gz'.
> +        if self.format == '1.0':
> +            if ((diff_count == 0 and native_tar_count == 0) or
> +                (diff_count > 0 and native_tar_count > 0)):
> +                yield UploadError(
> +                    "%s: must have exactly one diff.gz or tar.gz."
> +                    % self.filename)
> +        else:
> +            raise AssertionError("Unknown source format.")
>
>          if files_missing:
>              yield UploadError(
>
> === modified file 'lib/lp/archiveuploader/nascentupload.py'
> --- lib/lp/archiveuploader/nascentupload.py	2009-09-04 08:35:20 +0000
> +++ lib/lp/archiveuploader/nascentupload.py	2009-11-11 14:24:18 +0000
> @@ -28,8 +28,10 @@
>  from lp.archiveuploader.nascentuploadfile import (
>      UploadError, UploadWarning, CustomUploadFile, SourceUploadFile,
>      BaseBinaryUploadFile)
> +from lp.archiveuploader.utils import determine_source_file_type
>  from lp.archiveuploader.permission import verify_upload
>  from lp.registry.interfaces.pocket import PackagePublishingPocket
> +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
>  from lp.soyuz.interfaces.archive import ArchivePurpose, MAIN_ARCHIVE_PURPOSES
>  from canonical.launchpad.interfaces import (
>      IBinaryPackageNameSet, IDistributionSet, ILibraryFileAliasSet,
> @@ -302,53 +304,38 @@
>          """Heuristic checks on a sourceful upload.
>
>          Raises AssertionError when called for a non-sourceful upload.
> -        Ensures a sourceful upload has, at least:
> -
> -         * One DSC
> -         * One or none DIFF
> -         * One or none ORIG
> -         * One or none TAR
> -         * If no DIFF is present it must have a TAR (native)
> -
> -        'hasorig' and 'native' attributes are set when an ORIG and/or an
> -        TAR file, respectively, are present.
> +        Ensures a sourceful upload has exactly one DSC.
>          """
>          assert self.sourceful, (
>              "Source consistency check called for a non-source upload")
>
>          dsc = 0
> -        diff = 0
> -        orig = 0
> -        tar = 0
> +        native_tarball = 0
> +        orig_tarball = 0
>
>          for uploaded_file in self.changes.files:
> -            if uploaded_file.filename.endswith(".dsc"):
> +            filetype = determine_source_file_type(uploaded_file.filename)
> +            if filetype == SourcePackageFileType.DSC:
>                  dsc += 1
> -            elif uploaded_file.filename.endswith(".diff.gz"):
> -                diff += 1
> -            elif uploaded_file.filename.endswith(".orig.tar.gz"):
> -                orig += 1
> -            elif (uploaded_file.filename.endswith(".tar.gz")
> +            elif (filetype == SourcePackageFileType.NATIVE_TARBALL
>                    and not isinstance(uploaded_file, CustomUploadFile)):

We don't (afaik) have a policy to prefer isinstance() or interfaces,
but consider here if it's better to use ISomeInterface.providedBy()
instead of isinstance().

> -                tar += 1
> -
> -        # Okay, let's check the sanity of the upload.
> +                native_tarball += 1
> +            elif filetype == SourcePackageFileType.ORIG_TARBALL:
> +                orig_tarball += 1
> +
> +
> +        # It is never sane to upload more than one source at a time.
> +        # XXX: What about orphaned files? How will that work?
> +        #      I think we might need to verify that all source files are
> +        #      claimed by a dsc.

Julian commented on this. If you decide to leave the XXX in, please
file a bug for it, and make sure it's formatted according to
https://dev.launchpad.net/XXXPolicy.

>          if dsc > 1:
>              self.reject("Changes file lists more than one .dsc")
> -        if diff > 1:
> -            self.reject("Changes file lists more than one .diff.gz")
> -        if orig > 1:
> -            self.reject("Changes file lists more than one orig.tar.gz")
> -        if tar > 1:
> -            self.reject("Changes file lists more than one native tar.gz")
>
>          if dsc == 0:
>              self.reject("Sourceful upload without a .dsc")
> -        if diff == 0 and tar == 0:
> -            self.reject("Sourceful upload without a diff or native tar")
>
> -        self.native = bool(tar)
> -        self.hasorig = bool(orig)
> +        self.native = bool(native_tarball)
> +        self.hasorig = bool(orig_tarball)
>
>      def _check_binaryful_consistency(self):
>          """Heuristic checks on a binaryful upload.
>
> === modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
> --- lib/lp/archiveuploader/nascentuploadfile.py	2009-07-17 00:26:05 +0000
> +++ lib/lp/archiveuploader/nascentuploadfile.py	2009-11-11 14:24:18 +0000
> @@ -33,8 +33,9 @@
>  from lp.archiveuploader.utils import (
>      prefix_multi_line_string, re_taint_free, re_isadeb, re_issource,
>      re_no_epoch, re_no_revision, re_valid_version, re_valid_pkg_name,
> -    re_extract_src_version)
> +    re_extract_src_version, determine_source_file_type)
>  from canonical.encoding import guess as guess_encoding
> +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
>  from lp.soyuz.interfaces.binarypackagename import (
>      IBinaryPackageNameSet)
>  from lp.soyuz.interfaces.binarypackagerelease import (
> @@ -351,7 +352,8 @@
>                  "Architecture field." % (self.filename))
>
>          version_chopped = re_no_epoch.sub('', self.version)
> -        if self.filename.endswith("orig.tar.gz"):
> +        if determine_source_file_type(self.filename) == (
> +            SourcePackageFileType.ORIG_TARBALL):
>              version_chopped = re_no_revision.sub('', version_chopped)
>
>          source_match = re_issource.match(self.filename)
>
> === modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
> --- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-09-04 08:35:20 +0000
> +++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-11 14:24:18 +0000
> @@ -49,6 +49,7 @@
>  from lp.soyuz.interfaces.archivepermission import (
>      ArchivePermissionType, IArchivePermissionSet)
>  from lp.soyuz.interfaces.component import IComponentSet
> +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
>  from lp.registry.interfaces.person import IPersonSet
>  from lp.registry.interfaces.sourcepackagename import (
>      ISourcePackageNameSet)
> @@ -157,7 +158,7 @@
>                  excName = str(excClass)
>              raise self.failureException, "%s not raised" % excName
>
> -    def setupBreezy(self, name="breezy"):
> +    def setupBreezy(self, name="breezy", permitted_formats=None):
>          """Create a fresh distroseries in ubuntu.
>
>          Use *initialiseFromParent* procedure to create 'breezy'
> @@ -168,6 +169,8 @@
>
>          :param name: supply the name of the distroseries if you don't want
>              it to be called "breezy"
> +        :param permitted_formats: list of SourcePackageFormats to allow
> +            in the new distroseries. Only permits '1.0' by default.
>          """
>          self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
>          bat = self.ubuntu['breezy-autotest']
> @@ -185,6 +188,12 @@
>          self.breezy.changeslist = 'breezy-changes@ubuntu.com'
>          self.breezy.initialiseFromParent()
>
> +        if permitted_formats is None:
> +            permitted_formats = [SourcePackageFormat.FORMAT_1_0]
> +
> +        for format in permitted_formats:
> +            self.breezy.permitSourcePackageFormat(format)
> +
>      def addMockFile(self, filename, content="anything"):
>          """Return a librarian file."""
>          return getUtility(ILibraryFileAliasSet).create(
>
> === modified file 'lib/lp/archiveuploader/tests/test_utils.py'
> --- lib/lp/archiveuploader/tests/test_utils.py	2009-06-24 23:33:29 +0000
> +++ lib/lp/archiveuploader/tests/test_utils.py	2009-11-11 14:24:18 +0000
> @@ -8,6 +8,8 @@
>  import unittest
>  import sys
>  import shutil
> +
> +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
>  from lp.archiveuploader.tests import datadir
>
>
> @@ -17,6 +19,23 @@
>          """lp.archiveuploader.utils should be importable"""
>          import lp.archiveuploader.utils
>
> +    def test_determine_source_file_type(self):
> +        """lp.archiveuploader.utils.determine_source_file_type should work."""
> +        from lp.archiveuploader.utils import determine_source_file_type
> +
> +        self.assertEquals(
> +            determine_source_file_type('foo_1.0-1.dsc'),
> +            SourcePackageFileType.DSC)

I'm not sure if it's written down anywhere, but there was a consensus
a few months ago to call assertEqual (and all similar TestCase
methods) with the args in the order (expected, observed).

> +        self.assertEquals(
> +            determine_source_file_type('foo_1.0-1.diff.gz'),
> +            SourcePackageFileType.DIFF)
> +        self.assertEquals(
> +            determine_source_file_type('foo_1.0.orig.tar.gz'),
> +            SourcePackageFileType.ORIG_TARBALL)
> +        self.assertEquals(
> +            determine_source_file_type('foo_1.0.tar.gz'),
> +            SourcePackageFileType.NATIVE_TARBALL)
> +
>      def testPrefixMultilineString(self):
>          """lp.archiveuploader.utils.prefix_multi_line_string should work"""
>          from lp.archiveuploader.utils import prefix_multi_line_string
>
> === modified file 'lib/lp/archiveuploader/utils.py'
> --- lib/lp/archiveuploader/utils.py	2009-06-24 23:33:29 +0000
> +++ lib/lp/archiveuploader/utils.py	2009-11-11 14:24:18 +0000
> @@ -15,6 +15,8 @@
>      're_valid_pkg_name',
>      're_changes_file_name',
>      're_extract_src_version',
> +    'get_source_file_extension',
> +    'determine_source_file_type',
>      'prefix_multi_line_string',
>      'safe_fix_maintainer',
>      'ParseMaintError',
> @@ -31,7 +33,15 @@
>  re_taint_free = re.compile(r"^[-+~/\.\w]+$")
>
>  re_isadeb = re.compile(r"(.+?)_(.+?)_(.+)\.(u?d?deb)$")
> -re_issource = re.compile(r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)$")
> +
> +re_issource = re.compile(
> +    r"(.+)_(.+?)\."
> +     "(orig\.tar\.gz"
> +     "|diff\.gz"
> +     "|tar\.gz"
> +     "|dsc)$")

I think this would be clearer if you used the re.VERBOSE flag.

Also, consider something like the following:

source_file_exts = ['orig.tar.gz', 'diff.gz', 'tar.gz', 'dsc']
    re_issource = r"(.+)_(.+?)\.(%s)" % "|".join(
        re.escape(ext) for ext in source_file_exts)

To me anyway, that seems easier to verify that it'll DTRT.

> +re_is_orig_tar_ext = re.compile(r"^orig.tar.gz$")
> +re_is_native_tar_ext = re.compile(r"^tar.gz$")
>
>  re_no_epoch = re.compile(r"^\d+\:")
>  re_no_revision = re.compile(r"-[^-]+$")
> @@ -44,6 +54,32 @@
>  re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>")
>
>
> +def get_source_file_extension(filename):
> +    """Get the extension part of a source file name."""
> +    match = re_issource.match(filename)
> +    if match is None:
> +        return None
> +    return match.group(3)
> +
> +
> +def determine_source_file_type(filename):
> +    """Determine the SourcePackageFileType of the given filename."""
> +    # Avoid circular imports.
> +    from lp.registry.interfaces.sourcepackage import SourcePackageFileType
> +
> +    extension = get_source_file_extension(filename)
> +    if extension is None:
> +        return None
> +    elif extension == "dsc":
> +        return SourcePackageFileType.DSC
> +    elif extension == "diff.gz":
> +        return SourcePackageFileType.DIFF
> +    elif re_is_orig_tar_ext.match(extension):
> +        return SourcePackageFileType.ORIG_TARBALL
> +    elif re_is_native_tar_ext.match(extension):
> +        return SourcePackageFileType.NATIVE_TARBALL

Please can you add an else clause, if only to assert that it should
never happen.

> +
> +
>  def prefix_multi_line_string(str, prefix, include_blank_lines=0):
>      """Utility function to split an input string and prefix,
>
>
> === modified file 'lib/lp/registry/interfaces/distroseries.py'
> --- lib/lp/registry/interfaces/distroseries.py	2009-11-07 16:14:22 +0000
> +++ lib/lp/registry/interfaces/distroseries.py	2009-11-11 14:24:18 +0000
> @@ -205,6 +205,12 @@
>      def newMilestone(name, dateexpected=None, summary=None, code_name=None):
>          """Create a new milestone for this DistroSeries."""
>
> +    def permitSourcePackageFormat(format):
> +        """Permit a source format to be uploaded to this series.
> +
> +        :param format: The SourcePackageFormat to permit.
> +        """
> +
>
>  class ISeriesMixin(Interface):
>      """Methods & properties shared between distro & product series."""
> @@ -851,6 +857,12 @@
>          :return: A string.
>          """
>
> +    def isSourcePackageFormatPermitted(format):
> +        """Check if the specified source format is allowed in this series.
> +
> +        :param format: The SourcePackageFormat to check.
> +        """
> +
>
>  class IDistroSeries(IDistroSeriesEditRestricted, IDistroSeriesPublic,
>                      IStructuralSubscriptionTarget):
>
> === modified file 'lib/lp/registry/interfaces/sourcepackage.py'
> --- lib/lp/registry/interfaces/sourcepackage.py	2009-11-07 09:50:37 +0000
> +++ lib/lp/registry/interfaces/sourcepackage.py	2009-11-11 14:24:18 +0000
> @@ -275,7 +275,7 @@
>          which in turn lists the orig.tar.gz and diff.tar.gz files used to
>          make up the package.  """)
>
> -    ORIG = DBItem(4, """
> +    ORIG_TARBALL = DBItem(4, """
>          Orig Tarball
>
>          This file is an Ubuntu "orig" file, typically an upstream tarball or
> @@ -289,8 +289,8 @@
>          diff creates additional directories with patches and documentation
>          used to build the binary packages for Ubuntu.  """)
>
> -    TARBALL = DBItem(6, """
> -        Tarball
> +    NATIVE_TARBALL = DBItem(6, """
> +        Native Tarball
>
>          This is a tarball, usually of a mixture of Ubuntu and upstream code,
>          used in the build process for this source package.  """)
>
> === modified file 'lib/lp/registry/model/distroseries.py'
> --- lib/lp/registry/model/distroseries.py	2009-11-07 16:14:22 +0000
> +++ lib/lp/registry/model/distroseries.py	2009-11-11 14:24:18 +0000
> @@ -82,6 +82,7 @@
>  from lp.registry.model.sourcepackagename import SourcePackageName
>  from lp.soyuz.model.sourcepackagerelease import (
>      SourcePackageRelease)
> +from lp.soyuz.model.sourcepackageformat import SourcePackageFormatSelection
>  from lp.blueprints.model.specification import (
>      HasSpecificationsMixin, Specification)
>  from lp.translations.model.translationimportqueue import (
> @@ -1496,7 +1497,7 @@
>          cur = cursor()
>
>          # Perform the copies
> -        self._copy_component_and_section_selections(cur)
> +        self._copy_component_section_and_format_selections(cur)
>
>          # Prepare the list of distroarchseries for which binary packages
>          # shall be copied.
> @@ -1557,9 +1558,9 @@
>                  PackagePublishingPocket.RELEASE)
>              clone_packages(origin, destination, distroarchseries_list)
>
> -    def _copy_component_and_section_selections(self, cur):
> -        """Copy the section and component selections from the parent distro
> -        series into this one.
> +    def _copy_component_section_and_format_selections(self, cur):
> +        """Copy the section, component and format selections from the parent
> +        distro series into this one.
>          """
>          # Copy the component selections
>          cur.execute('''
> @@ -1573,6 +1574,13 @@
>              SELECT %s as distroseries, ss.section AS section
>              FROM SectionSelection AS ss WHERE ss.distroseries = %s
>              ''' % sqlvalues(self.id, self.parent_series.id))
> +        # Copy the source format selections
> +        cur.execute('''
> +            INSERT INTO SourcePackageFormatSelection (distroseries, format)
> +            SELECT %s as distroseries, spfs.format AS format
> +            FROM SourcePackageFormatSelection AS spfs
> +            WHERE spfs.distroseries = %s
> +            ''' % sqlvalues(self.id, self.parent_series.id))
>
>      def copyTranslationsFromParent(self, transaction, logger=None):
>          """See `IDistroSeries`."""
> @@ -1739,6 +1747,16 @@
>          else:
>              return '%s%s' % (self.name, pocketsuffix[pocket])
>
> +    def isSourcePackageFormatPermitted(self, format):
> +        return Store.of(self).find(
> +            SourcePackageFormatSelection, distroseries=self,
> +            format=format).count() == 1
> +
> +    def permitSourcePackageFormat(self, format):
> +        if not self.isSourcePackageFormatPermitted(format):
> +            return Store.of(self).add(
> +                SourcePackageFormatSelection(self, format))
> +
>
>  class DistroSeriesSet:
>      implements(IDistroSeriesSet)
>
> === modified file 'lib/lp/soyuz/doc/archive.txt'
> --- lib/lp/soyuz/doc/archive.txt	2009-11-09 13:01:13 +0000
> +++ lib/lp/soyuz/doc/archive.txt	2009-11-11 14:24:18 +0000
> @@ -850,7 +850,7 @@
>
>      >>> print_published_files(cprov_archive)
>      cdrkit - 1.0: foobar-1.0.dsc (DSC, 716 bytes)
> -    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
> +    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
>      iceweasel - 1.0: iceweasel-1.0.dsc (DSC, 123 bytes)
>
>  Now we will emulate a duplicated reference to the same 'orig.tar.gz',
> @@ -867,9 +867,9 @@
>  'firefox_0.9.2.orig.tar.gz' file.
>
>      >>> print_published_files(cprov_archive)
> -    cdrkit - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
> +    cdrkit - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
>      cdrkit - 1.0: foobar-1.0.dsc (DSC, 716 bytes)
> -    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
> +    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
>      iceweasel - 1.0: iceweasel-1.0.dsc (DSC, 123 bytes)
>
>  Similarly to what happen in the archive disk 'pool', where already
>
> === modified file 'lib/lp/soyuz/doc/initialise-from-parent.txt'
> --- lib/lp/soyuz/doc/initialise-from-parent.txt	2009-10-26 18:40:04 +0000
> +++ lib/lp/soyuz/doc/initialise-from-parent.txt	2009-11-11 14:24:18 +0000
> @@ -172,3 +172,10 @@
>    >>> pmount_source.sourcepackagerelease.getBuildByArch(
>    ...    foobuntu['hppa'], ubuntu.main_archive) is None
>    True
> +
> +initialiseFromParent also copies the permitted source formats from the
> +parent series.
> +
> +  >>> from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
> +  >>> foobuntu.isSourcePackageFormatPermitted(SourcePackageFormat.FORMAT_1_0)
> +  True
>
> === added file 'lib/lp/soyuz/interfaces/sourcepackageformat.py'
> --- lib/lp/soyuz/interfaces/sourcepackageformat.py	1970-01-01 00:00:00 +0000
> +++ lib/lp/soyuz/interfaces/sourcepackageformat.py	2009-11-11 14:24:18 +0000
> @@ -0,0 +1,52 @@
> +# Copyright 2009 Canonical Ltd.  This software is licensed under the
> +# GNU Affero General Public License version 3 (see the file LICENSE).
> +
> +"""Source package format interfaces."""
> +
> +__metaclass__ = type
> +
> +__all__ = [
> +    'SourcePackageFormat',
> +    'ISourcePackageFormatSelection',
> +    ]
> +
> +from zope.interface import Attribute, Interface
> +from lazr.enum import DBEnumeratedType, DBItem
> +
> +
> +class SourcePackageFormat(DBEnumeratedType):
> +    """Source package format
> +
> +    There are currently three formats of Debian source packages. The Format
> +    field in the .dsc file must specify one of these formats.
> +    """
> +
> +    FORMAT_1_0 = DBItem(0, """
> +        1.0
> +
> +        Specifies either a native (having a single tar.gz) or non-native
> +        (having an orig.tar.gz and a diff.gz) package. Supports only gzip
> +        compression.
> +        """)
> +
> +    FORMAT_3_0_QUILT = DBItem(1, """
> +        3.0 (quilt)
> +
> +        Specifies a non-native package, with an orig.tar.* and a debian.tar.*.
> +        Supports gzip and bzip2 compression.
> +        """)
> +
> +    FORMAT_3_0_NATIVE = DBItem(2, """
> +        3.0 (native)
> +
> +        Specifies a native package, with a single tar.*. Supports gzip and
> +        bzip2 compression.
> +        """)
> +
> +
> +class ISourcePackageFormatSelection(Interface):
> +    """A source package format allowed within a DistroSeries."""
> +
> +    id = Attribute("ID")
> +    distroseries = Attribute("Target series")
> +    format = Attribute("Permitted source package format")
>
> === modified file 'lib/lp/soyuz/model/queue.py'
> --- lib/lp/soyuz/model/queue.py	2009-10-26 11:51:40 +0000
> +++ lib/lp/soyuz/model/queue.py	2009-11-11 14:24:18 +0000
> @@ -1468,7 +1468,8 @@
>              published_sha1 = published_file.content.sha1
>
>              # Multiple orig(s) with the same content are fine.
> -            if source_file.filetype == SourcePackageFileType.ORIG:
> +            if source_file.filetype == (
> +                SourcePackageFileType.ORIG_TARBALL):
>                  if proposed_sha1 == published_sha1:
>                      continue
>                  raise QueueInconsistentStateError(
>
> === added file 'lib/lp/soyuz/model/sourcepackageformat.py'
> --- lib/lp/soyuz/model/sourcepackageformat.py	1970-01-01 00:00:00 +0000
> +++ lib/lp/soyuz/model/sourcepackageformat.py	2009-11-11 14:24:18 +0000
> @@ -0,0 +1,35 @@
> +# Copyright 2009 Canonical Ltd.  This software is licensed under the
> +# GNU Affero General Public License version 3 (see the file LICENSE).
> +
> +__metaclass__ = type
> +
> +__all__ = [
> +    'SourcePackageFormatSelection',
> +    ]
> +
> +from storm.locals import Storm, Int, Reference
> +from zope.interface import implements
> +
> +from canonical.database.enumcol import DBEnum
> +from lp.soyuz.interfaces.sourcepackageformat import (
> +    ISourcePackageFormatSelection, SourcePackageFormat)
> +
> +class SourcePackageFormatSelection(Storm):
> +    """See ISourcePackageFormatSelection."""
> +
> +    implements(ISourcePackageFormatSelection)
> +
> +    def __init__(self, distroseries, format):
> +        super(SourcePackageFormatSelection, self).__init__()
> +        self.distroseries = distroseries
> +        self.format = format
> +
> +    __storm_table__ = 'sourcepackageformatselection'
> +
> +    id = Int(primary=True)
> +
> +    distroseries_id = Int(name="distroseries")
> +    distroseries = Reference(distroseries_id, 'DistroSeries.id')
> +
> +    format = DBEnum(enum=SourcePackageFormat)
> +
>
> === modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
> --- lib/lp/soyuz/model/sourcepackagerelease.py	2009-11-07 09:50:37 +0000
> +++ lib/lp/soyuz/model/sourcepackagerelease.py	2009-11-11 14:24:18 +0000
> @@ -36,6 +36,7 @@
>  from lp.translations.interfaces.translationimportqueue import (
>      ITranslationImportQueue)
>  from canonical.launchpad.webapp.interfaces import NotFoundError
> +from lp.archiveuploader.utils import determine_source_file_type
>  from lp.soyuz.interfaces.archive import (
>      ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
>  from lp.soyuz.interfaces.build import BuildStatus
> @@ -52,7 +53,7 @@
>  from lp.soyuz.scripts.queue import QueueActionError
>  from lp.registry.interfaces.person import validate_public_person
>  from lp.registry.interfaces.sourcepackage import (
> -    SourcePackageFileType, SourcePackageType, SourcePackageUrgency)
> +    SourcePackageType, SourcePackageUrgency)
>
>
>  def _filter_ubuntu_translation_file(filename):
> @@ -271,19 +272,10 @@
>
>      def addFile(self, file):
>          """See ISourcePackageRelease."""
> -        determined_filetype = None
> -        if file.filename.endswith(".dsc"):
> -            determined_filetype = SourcePackageFileType.DSC
> -        elif file.filename.endswith(".orig.tar.gz"):
> -            determined_filetype = SourcePackageFileType.ORIG
> -        elif file.filename.endswith(".diff.gz"):
> -            determined_filetype = SourcePackageFileType.DIFF
> -        elif file.filename.endswith(".tar.gz"):
> -            determined_filetype = SourcePackageFileType.TARBALL
> -
> -        return SourcePackageReleaseFile(sourcepackagerelease=self,
> -                                        filetype=determined_filetype,
> -                                        libraryfile=file)
> +        return SourcePackageReleaseFile(
> +            sourcepackagerelease=self,
> +            filetype=determine_source_file_type(file.filename),
> +            libraryfile=file)
>
>      def _getPackageSize(self):
>          """Get the size total (in KB) of files comprising this package.
>
> === modified file 'lib/lp/soyuz/scripts/packagecopier.py'
> --- lib/lp/soyuz/scripts/packagecopier.py	2009-10-29 12:18:05 +0000
> +++ lib/lp/soyuz/scripts/packagecopier.py	2009-11-11 14:24:18 +0000
> @@ -36,6 +36,7 @@
>      ISourcePackagePublishingHistory, active_publishing_status)
>  from lp.soyuz.interfaces.queue import (
>      IPackageUpload, IPackageUploadSet)
> +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
>  from lp.soyuz.scripts.ftpmasterbase import (
>      SoyuzScript, SoyuzScriptError)
>  from lp.soyuz.scripts.processaccepted import (
> @@ -356,6 +357,14 @@
>                  "Cannot copy to an unsupported distribution: %s." %
>                  source.distroseries.distribution.name)
>
> +        format = SourcePackageFormat.getTermByToken(
> +            source.sourcepackagerelease.dsc_format).value
> +
> +        if not series.isSourcePackageFormatPermitted(format):
> +            raise CannotCopy(
> +                "Source format '%s' not supported by target series %s." %
> +                (source.sourcepackagerelease.dsc_format, series.name))
> +
>          if self.include_binaries:
>              built_binaries = source.getBuiltBinaries()
>              if len(built_binaries) == 0:
>
> === modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
> --- lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-10-05 18:29:12 +0000
> +++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-11-11 14:24:18 +0000
> @@ -37,6 +37,7 @@
>      PackagePublishingStatus, active_publishing_status)
>  from lp.soyuz.interfaces.queue import (
>      PackageUploadCustomFormat, PackageUploadStatus)
> +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
>  from lp.soyuz.model.publishing import (
>      SecureSourcePackagePublishingHistory,
>      SecureBinaryPackagePublishingHistory)
> @@ -720,6 +721,31 @@
>              'Cannot copy to an unsupported distribution: ubuntu.',
>              copy_checker.checkCopy, source, series, pocket)
>
> +    def test_checkCopy_respects_sourceformatselection(self):
> +        # A source copy should be denied if the source's dsc_format is
> +        # not permitted in the target series.
> +
> +        # Get hoary, and configure it to accept 3.0 (quilt) uploads.
> +        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
> +        hoary = ubuntu.getSeries('hoary')
> +        hoary.permitSourcePackageFormat(SourcePackageFormat.FORMAT_3_0_QUILT)
> +
> +        # Create a 3.0 (quilt) source.
> +        source = self.test_publisher.getPubSource(
> +            distroseries=hoary, dsc_format='3.0 (quilt)')
> +
> +        archive = source.archive
> +        series = ubuntu.getSeries('warty')
> +        pocket = source.pocket
> +
> +        # An attempt to copy the source to warty, which only supports
> +        # 1.0 sources, is rejected.
> +        copy_checker = CopyChecker(archive, include_binaries=True)
> +        self.assertRaisesWithContent(
> +            CannotCopy,
> +            "Source format '3.0 (quilt)' not supported by target series "
> +            "warty.", copy_checker.checkCopy, source, series, pocket)
> +
>      def test_checkCopy_identifies_conflicting_copy_candidates(self):
>          # checkCopy() is able to identify conflicting candidates within
>          # the copy batch.
>

review: Approve

Revision history for this message

William Grant (wgrant) wrote on 2009-11-11:

> Hi William, thanks for making this change. There's some much-needed
> refactoring and clearing up in nascentupload.
>
> The basic direction is good, I just have a few comments to make for things
> that need fixing. Gavin will do a more thorough review as we agreed on IRC.
>
> General questions:
>
> * I can't tell from the diff but are the db permissions added for the new
> table correctly tested in the tests? This usually just means ensuring that
> the test runs as the correct db user.

I'll have to look at that later. I'm not quite sure.

> * The XXX about the orphaned files is interesting. I don't think we deal
> with this right now do we? I'm trying to think if it would be bad to reject
> the upload if we detect orphan files, and I can't think of one. What's your
> opinion?

I think there is a word or two missing there. You mean you can't think of a reason that it would be bad, or that it wouldn't be bad?

I can't see any compelling reason to reject if it has extra files, apart from it seeming slightly cleaner. If you feel it needs to be done, it's probably easy enough to add.

> Things that need fixing:
>
> * The upload format check is not tested. (The "%s: format '%s' is not
> permitted in %s." one)

Ah, yes, forgot about that. The other half of the branch has 3.0 format test source packages, and tests that. I suppose I should bring one of those in.

> * IDistroSeries methods permitSourcePackageFormat() and
> isSourcePackageFormatPermitted() should be in a utility, e.g.
> SourcePackageFormatSet. This ensures that in a zopeful environment they are
> security wrapped. Although the upload processor is zopeless, we might need to
> do that one day. Something like
> * SourcePackageFormatSet.add()
> * SourcePackageFormatSet.getByFormat()
> would fit with our current style. You can keep the
> isSourcePackageFormatPermitted() and make it call the utility method as a
> convenience, but the permitSourcePackageFormat() should go.
>
> * Once that's done, you should remove the __init__ on the SourcePackageFormat
> model class and make the new utility's add() method initialise the correct
> fields.

OK, sure. Will fix.

> Everything else looks great, thanks!

Thanks for the review.

> Hi William, thanks for making this change.  There's some much-needed
> refactoring and clearing up in nascentupload.
> 
> The basic direction is good, I just have a few comments to make for things
> that need fixing.  Gavin will do a more thorough review as we agreed on IRC.
> 
> General questions:
> 
>  * I can't tell from the diff but are the db permissions added for the new
> table correctly tested in the tests?  This usually just means ensuring that
> the test runs as the correct db user.

I'll have to look at that later. I'm not quite sure.

>  * The XXX about the orphaned files is interesting.  I don't think we deal
> with this right now do we?  I'm trying to think if it would be bad to reject
> the upload if we detect orphan files, and I can't think of one.  What's your
> opinion?

I think there is a word or two missing there. You mean you can't think of a reason that it would be bad, or that it wouldn't be bad?

I can't see any compelling reason to reject if it has extra files, apart from it seeming slightly cleaner. If you feel it needs to be done, it's probably easy enough to add.

> Things that need fixing:
> 
>  * The upload format check is not tested. (The "%s: format '%s' is not
> permitted in %s." one)

Ah, yes, forgot about that. The other half of the branch has 3.0 format test source packages, and tests that. I suppose I should bring one of those in.

>  * IDistroSeries methods permitSourcePackageFormat() and
> isSourcePackageFormatPermitted() should be in a utility, e.g.
> SourcePackageFormatSet.  This ensures that in a zopeful environment they are
> security wrapped.  Although the upload processor is zopeless, we might need to
> do that one day.  Something like
>    * SourcePackageFormatSet.add()
>    * SourcePackageFormatSet.getByFormat()
>    would fit with our current style.  You can keep the
> isSourcePackageFormatPermitted() and make it call the utility method as a
> convenience, but the permitSourcePackageFormat() should go.
> 
>  * Once that's done, you should remove the __init__ on the SourcePackageFormat
> model class and make the new utility's add() method initialise the correct
> fields.

OK, sure. Will fix.

> Everything else looks great, thanks!

Thanks for the review.

Revision history for this message

William Grant (wgrant) wrote on 2009-11-11:

Download full text (37.3 KiB)

Hi Gavin,

Thanks for the review.

> Hi William,
>
> As Julian has already reviewed the logic in this branch, I'll just do
> a style/convention review.
>
> I really have very little to say, and that which I have said is pretty
> trivial. It's inline with the diff below.
>
> Running `make lint` generated a lot of warnings. Please can you clean
> up those that make sense.

I don't think any of those are actually mine, and I felt my diff was big enough. If you think I should clean them up anyway, I will.

> Thanks, Gavin.
>
>
> > === modified file 'database/schema/security.cfg'
> > --- database/schema/security.cfg 2009-11-06 01:16:21 +0000
> > +++ database/schema/security.cfg 2009-11-11 14:24:18 +0000
> > @@ -271,6 +271,7 @@
> > public.shippingrun = SELECT, INSERT, UPDATE
> > public.sourcepackagepublishinghistory = SELECT
> > public.seriessourcepackagebranch = SELECT, INSERT, UPDATE, DELETE
> > +public.sourcepackageformatselection = SELECT
> > public.specificationbranch = SELECT, INSERT, UPDATE, DELETE
> > public.specificationbug = SELECT, INSERT, DELETE
> > public.specificationdependency = SELECT, INSERT, DELETE
> > @@ -986,6 +987,7 @@
> > public.section = SELECT, INSERT, UPDATE
> > public.sectionselection = SELECT, INSERT, UPDATE
> > public.signedcodeofconduct = SELECT, INSERT, UPDATE
> > +public.sourcepackageformatselection = SELECT, INSERT
>
> This should go after the following line. Wow, how pedantic I am :)

Oops -- I renamed the table after I added this line. Fixed.

Hi Gavin,

Thanks for the review.

> Hi William,
> 
> As Julian has already reviewed the logic in this branch, I'll just do
> a style/convention review.
> 
> I really have very little to say, and that which I have said is pretty
> trivial. It's inline with the diff below.
> 
> Running `make lint` generated a lot of warnings. Please can you clean
> up those that make sense.

I don't think any of those are actually mine, and I felt my diff was big enough. If you think I should clean them up anyway, I will.

> Thanks, Gavin.
> 
> 
> > === modified file 'database/schema/security.cfg'
> > --- database/schema/security.cfg      2009-11-06 01:16:21 +0000
> > +++ database/schema/security.cfg      2009-11-11 14:24:18 +0000
> > @@ -271,6 +271,7 @@
> >  public.shippingrun                      = SELECT, INSERT, UPDATE
> >  public.sourcepackagepublishinghistory   = SELECT
> >  public.seriessourcepackagebranch        = SELECT, INSERT, UPDATE, DELETE
> > +public.sourcepackageformatselection     = SELECT
> >  public.specificationbranch              = SELECT, INSERT, UPDATE, DELETE
> >  public.specificationbug                 = SELECT, INSERT, DELETE
> >  public.specificationdependency          = SELECT, INSERT, DELETE
> > @@ -986,6 +987,7 @@
> >  public.section                          = SELECT, INSERT, UPDATE
> >  public.sectionselection                 = SELECT, INSERT, UPDATE
> >  public.signedcodeofconduct              = SELECT, INSERT, UPDATE
> > +public.sourcepackageformatselection     = SELECT, INSERT
> 
> This should go after the following line. Wow, how pedantic I am :)

Oops -- I renamed the table after I added this line. Fixed.

> >  public.sourcepackagefilepublishing      = SELECT, INSERT, UPDATE
> >  public.sourcepackagename                = SELECT, INSERT, UPDATE
> >  public.sourcepackagepublishinghistory   = SELECT
> > @@ -1103,6 +1105,7 @@
> >  public.archivepermission                = SELECT
> >  public.processor                        = SELECT
> >  public.processorfamily                  = SELECT
> > +public.sourcepackageformatselection     = SELECT
> >
> >  # Source and Binary packages and builds
> >  public.sourcepackagename                = SELECT, INSERT
> >
> > === modified file 'lib/canonical/launchpad/helpers.py'
> > --- lib/canonical/launchpad/helpers.py        2009-07-17 00:26:05 +0000
> > +++ lib/canonical/launchpad/helpers.py        2009-11-11 14:24:18 +0000
> > @@ -477,9 +477,9 @@
> >      if fname.endswith(".diff.gz"):
> >          return SourcePackageFileType.DIFF
> >      if fname.endswith(".orig.tar.gz"):
> > -        return SourcePackageFileType.ORIG
> > +        return SourcePackageFileType.ORIG_TARBALL
> >      if fname.endswith(".tar.gz"):
> > -        return SourcePackageFileType.TARBALL
> > +        return SourcePackageFileType.NATIVE_TARBALL
> >
> >
> >  BINARYPACKAGE_EXTENSIONS = {
> >
> > === modified file 'lib/lp/archiveuploader/dscfile.py'
> > --- lib/lp/archiveuploader/dscfile.py 2009-06-24 23:33:29 +0000
> > +++ lib/lp/archiveuploader/dscfile.py 2009-11-11 14:24:18 +0000
> > @@ -31,10 +31,13 @@
> >      parse_tagfile, TagFileParseError)
> >  from lp.archiveuploader.utils import (
> >      prefix_multi_line_string, safe_fix_maintainer, ParseMaintError,
> > -    re_valid_pkg_name, re_valid_version, re_issource)
> > +    re_valid_pkg_name, re_valid_version, re_issource,
> > +    determine_source_file_type)
> >  from canonical.encoding import guess as guess_encoding
> >  from lp.registry.interfaces.person import IPersonSet,
> PersonCreationRationale
> > +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
> >  from lp.soyuz.interfaces.archive import ArchivePurpose
> > +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
> >  from canonical.launchpad.interfaces import (
> >      GPGVerificationError, IGPGHandler, IGPGKeySet,
> >      ISourcePackageNameSet, NotFoundError)
> > @@ -228,6 +231,9 @@
> >          This method is an error generator, i.e, it returns an iterator over
> all
> >          exceptions that are generated while processing DSC file checks.
> >          """
> > +        # Avoid circular imports.
> > +        from lp.archiveuploader.nascentupload import EarlyReturnUploadError
> > +
> >          for error in SourceUploadFile.verify(self):
> >              yield error
> >
> > @@ -265,10 +271,17 @@
> >              yield UploadError(
> >                  "%s: invalid version %s" % (self.filename,
> self.dsc_version))
> >
> > -        if self.format != "1.0":
> > +        try:
> > +            format_term = SourcePackageFormat.getTermByToken(self.format)
> > +        except LookupError:
> > +            raise EarlyReturnUploadError(
> > +                "Unsupported source format: %s" % self.format)
> > +
> > +        if not self.policy.distroseries.isSourcePackageFormatPermitted(
> > +            format_term.value):
> >              yield UploadError(
> > -                "%s: Format is not 1.0. This is incompatible with "
> > -                "dpkg-source." % self.filename)
> > +                "%s: format '%s' is not permitted in %s." %
> > +                (self.filename, self.format,
> self.policy.distroseries.name))
> >
> >          # Validate the build dependencies
> >          for field_name in ['build-depends', 'build-depends-indep']:
> > @@ -324,7 +337,8 @@
> >          :raise: `NotFoundError` when the wanted file could not be found.
> >          """
> >          if (self.policy.archive.purpose == ArchivePurpose.PPA and
> > -            filename.endswith('.orig.tar.gz')):
> > +            determine_source_file_type(filename) ==
> > +                SourcePackageFileType.ORIG_TARBALL):
> >              archives = [self.policy.archive,
> self.policy.distro.main_archive]
> >          else:
> >              archives = [self.policy.archive]
> > @@ -348,11 +362,25 @@
> >          We don't use the NascentUploadFile.verify here, only verify size
> >          and checksum.
> >          """
> > -        has_tar = False
> > +
> > +        diff_count = 0
> > +        orig_tar_count = 0
> > +        native_tar_count = 0
> > +
> >          files_missing = False
> >          for sub_dsc_file in self.files:
> > -            if sub_dsc_file.filename.endswith("tar.gz"):
> > -                has_tar = True
> > +            filetype = determine_source_file_type(sub_dsc_file.filename)
> > +
> > +            if filetype == SourcePackageFileType.DIFF:
> > +                diff_count += 1
> > +            elif filetype == SourcePackageFileType.ORIG_TARBALL:
> > +                orig_tar_count += 1
> > +            elif filetype == SourcePackageFileType.NATIVE_TARBALL:
> > +                native_tar_count += 1
> > +            else:
> > +                yield UploadError('Unknown file: ' + sub_dsc_file.filename)
> > +                continue
> > +
> >              try:
> >                  library_file, file_archive = self._getFileByName(
> >                      sub_dsc_file.filename)
> > @@ -397,11 +425,37 @@
> >                  yield error
> >                  files_missing = True
> >
> > -
> > -        if not has_tar:
> > -            yield UploadError(
> > -                "%s: does not mention any tar.gz or orig.tar.gz."
> > -                % self.filename)
> > +        # Reject if we have more than one file of any type.
> > +        if orig_tar_count > 1:
> > +            yield UploadError(
> > +                "%s: has more than one orig.tar.*."
> > +                % self.filename)
> > +        if native_tar_count > 1:
> > +            yield UploadError(
> > +                "%s: has more than one tar.*."
> > +                % self.filename)
> > +        if diff_count > 1:
> > +            yield UploadError(
> > +                "%s: has more than one diff.gz."
> > +                % self.filename)
> > +
> > +        if ((orig_tar_count == 0 and native_tar_count == 0) or
> > +            (orig_tar_count > 0 and native_tar_count > 0)):
> > +            yield UploadError(
> > +                "%s: must have exactly one tar.* or orig.tar.*."
> > +                % self.filename)
> > +
> > +        # Format 1.0 must be native (exactly one tar.gz), or
> > +        # have an orig.tar.gz and a diff.gz. It cannot have
> > +        # compression types other than 'gz'.
> > +        if self.format == '1.0':
> > +            if ((diff_count == 0 and native_tar_count == 0) or
> > +                (diff_count > 0 and native_tar_count > 0)):
> > +                yield UploadError(
> > +                    "%s: must have exactly one diff.gz or tar.gz."
> > +                    % self.filename)
> > +        else:
> > +            raise AssertionError("Unknown source format.")
> >
> >          if files_missing:
> >              yield UploadError(
> >
> > === modified file 'lib/lp/archiveuploader/nascentupload.py'
> > --- lib/lp/archiveuploader/nascentupload.py   2009-09-04 08:35:20 +0000
> > +++ lib/lp/archiveuploader/nascentupload.py   2009-11-11 14:24:18 +0000
> > @@ -28,8 +28,10 @@
> >  from lp.archiveuploader.nascentuploadfile import (
> >      UploadError, UploadWarning, CustomUploadFile, SourceUploadFile,
> >      BaseBinaryUploadFile)
> > +from lp.archiveuploader.utils import determine_source_file_type
> >  from lp.archiveuploader.permission import verify_upload
> >  from lp.registry.interfaces.pocket import PackagePublishingPocket
> > +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
> >  from lp.soyuz.interfaces.archive import ArchivePurpose,
> MAIN_ARCHIVE_PURPOSES
> >  from canonical.launchpad.interfaces import (
> >      IBinaryPackageNameSet, IDistributionSet, ILibraryFileAliasSet,
> > @@ -302,53 +304,38 @@
> >          """Heuristic checks on a sourceful upload.
> >
> >          Raises AssertionError when called for a non-sourceful upload.
> > -        Ensures a sourceful upload has, at least:
> > -
> > -         * One DSC
> > -         * One or none DIFF
> > -         * One or none ORIG
> > -         * One or none TAR
> > -         * If no DIFF is present it must have a TAR (native)
> > -
> > -        'hasorig' and 'native' attributes are set when an ORIG and/or an
> > -        TAR file, respectively, are present.
> > +        Ensures a sourceful upload has exactly one DSC.
> >          """
> >          assert self.sourceful, (
> >              "Source consistency check called for a non-source upload")
> >
> >          dsc = 0
> > -        diff = 0
> > -        orig = 0
> > -        tar = 0
> > +        native_tarball = 0
> > +        orig_tarball = 0
> >
> >          for uploaded_file in self.changes.files:
> > -            if uploaded_file.filename.endswith(".dsc"):
> > +            filetype = determine_source_file_type(uploaded_file.filename)
> > +            if filetype == SourcePackageFileType.DSC:
> >                  dsc += 1
> > -            elif uploaded_file.filename.endswith(".diff.gz"):
> > -                diff += 1
> > -            elif uploaded_file.filename.endswith(".orig.tar.gz"):
> > -                orig += 1
> > -            elif (uploaded_file.filename.endswith(".tar.gz")
> > +            elif (filetype == SourcePackageFileType.NATIVE_TARBALL
> >                    and not isinstance(uploaded_file, CustomUploadFile)):
> 
> We don't (afaik) have a policy to prefer isinstance() or interfaces,
> but consider here if it's better to use ISomeInterface.providedBy()
> instead of isinstance().

There are no interfaces for the objects in these parts of the code, so I've left it as it is.

> > -                tar += 1
> > -
> > -        # Okay, let's check the sanity of the upload.
> > +                native_tarball += 1
> > +            elif filetype == SourcePackageFileType.ORIG_TARBALL:
> > +                orig_tarball += 1
> > +
> > +
> > +        # It is never sane to upload more than one source at a time.
> > +        # XXX: What about orphaned files? How will that work?
> > +        #      I think we might need to verify that all source files are
> > +        #      claimed by a dsc.
> 
> Julian commented on this. If you decide to leave the XXX in, please
> file a bug for it, and make sure it's formatted according to
> https://dev.launchpad.net/XXXPolicy.

Will do, once I work it out with Julian.

> >          if dsc > 1:
> >              self.reject("Changes file lists more than one .dsc")
> > -        if diff > 1:
> > -            self.reject("Changes file lists more than one .diff.gz")
> > -        if orig > 1:
> > -            self.reject("Changes file lists more than one orig.tar.gz")
> > -        if tar > 1:
> > -            self.reject("Changes file lists more than one native tar.gz")
> >
> >          if dsc == 0:
> >              self.reject("Sourceful upload without a .dsc")
> > -        if diff == 0 and tar == 0:
> > -            self.reject("Sourceful upload without a diff or native tar")
> >
> > -        self.native = bool(tar)
> > -        self.hasorig = bool(orig)
> > +        self.native = bool(native_tarball)
> > +        self.hasorig = bool(orig_tarball)
> >
> >      def _check_binaryful_consistency(self):
> >          """Heuristic checks on a binaryful upload.
> >
> > === modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
> > --- lib/lp/archiveuploader/nascentuploadfile.py       2009-07-17 00:26:05
> +0000
> > +++ lib/lp/archiveuploader/nascentuploadfile.py       2009-11-11 14:24:18
> +0000
> > @@ -33,8 +33,9 @@
> >  from lp.archiveuploader.utils import (
> >      prefix_multi_line_string, re_taint_free, re_isadeb, re_issource,
> >      re_no_epoch, re_no_revision, re_valid_version, re_valid_pkg_name,
> > -    re_extract_src_version)
> > +    re_extract_src_version, determine_source_file_type)
> >  from canonical.encoding import guess as guess_encoding
> > +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
> >  from lp.soyuz.interfaces.binarypackagename import (
> >      IBinaryPackageNameSet)
> >  from lp.soyuz.interfaces.binarypackagerelease import (
> > @@ -351,7 +352,8 @@
> >                  "Architecture field." % (self.filename))
> >
> >          version_chopped = re_no_epoch.sub('', self.version)
> > -        if self.filename.endswith("orig.tar.gz"):
> > +        if determine_source_file_type(self.filename) == (
> > +            SourcePackageFileType.ORIG_TARBALL):
> >              version_chopped = re_no_revision.sub('', version_chopped)
> >
> >          source_match = re_issource.match(self.filename)
> >
> > === modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
> > --- lib/lp/archiveuploader/tests/test_uploadprocessor.py      2009-09-04
> 08:35:20 +0000
> > +++ lib/lp/archiveuploader/tests/test_uploadprocessor.py      2009-11-11
> 14:24:18 +0000
> > @@ -49,6 +49,7 @@
> >  from lp.soyuz.interfaces.archivepermission import (
> >      ArchivePermissionType, IArchivePermissionSet)
> >  from lp.soyuz.interfaces.component import IComponentSet
> > +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
> >  from lp.registry.interfaces.person import IPersonSet
> >  from lp.registry.interfaces.sourcepackagename import (
> >      ISourcePackageNameSet)
> > @@ -157,7 +158,7 @@
> >                  excName = str(excClass)
> >              raise self.failureException, "%s not raised" % excName
> >
> > -    def setupBreezy(self, name="breezy"):
> > +    def setupBreezy(self, name="breezy", permitted_formats=None):
> >          """Create a fresh distroseries in ubuntu.
> >
> >          Use *initialiseFromParent* procedure to create 'breezy'
> > @@ -168,6 +169,8 @@
> >
> >          :param name: supply the name of the distroseries if you don't want
> >              it to be called "breezy"
> > +        :param permitted_formats: list of SourcePackageFormats to allow
> > +            in the new distroseries. Only permits '1.0' by default.
> >          """
> >          self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
> >          bat = self.ubuntu['breezy-autotest']
> > @@ -185,6 +188,12 @@
> >          self.breezy.changeslist = 'breezy-changes@ubuntu.com'
> >          self.breezy.initialiseFromParent()
> >
> > +        if permitted_formats is None:
> > +            permitted_formats = [SourcePackageFormat.FORMAT_1_0]
> > +
> > +        for format in permitted_formats:
> > +            self.breezy.permitSourcePackageFormat(format)
> > +
> >      def addMockFile(self, filename, content="anything"):
> >          """Return a librarian file."""
> >          return getUtility(ILibraryFileAliasSet).create(
> >
> > === modified file 'lib/lp/archiveuploader/tests/test_utils.py'
> > --- lib/lp/archiveuploader/tests/test_utils.py        2009-06-24 23:33:29
> +0000
> > +++ lib/lp/archiveuploader/tests/test_utils.py        2009-11-11 14:24:18
> +0000
> > @@ -8,6 +8,8 @@
> >  import unittest
> >  import sys
> >  import shutil
> > +
> > +from lp.registry.interfaces.sourcepackage import SourcePackageFileType
> >  from lp.archiveuploader.tests import datadir
> >
> >
> > @@ -17,6 +19,23 @@
> >          """lp.archiveuploader.utils should be importable"""
> >          import lp.archiveuploader.utils
> >
> > +    def test_determine_source_file_type(self):
> > +        """lp.archiveuploader.utils.determine_source_file_type should
> work."""
> > +        from lp.archiveuploader.utils import determine_source_file_type
> > +
> > +        self.assertEquals(
> > +            determine_source_file_type('foo_1.0-1.dsc'),
> > +            SourcePackageFileType.DSC)
> 
> I'm not sure if it's written down anywhere, but there was a consensus
> a few months ago to call assertEqual (and all similar TestCase
> methods) with the args in the order (expected, observed).

Swapped.

> > +        self.assertEquals(
> > +            determine_source_file_type('foo_1.0-1.diff.gz'),
> > +            SourcePackageFileType.DIFF)
> > +        self.assertEquals(
> > +            determine_source_file_type('foo_1.0.orig.tar.gz'),
> > +            SourcePackageFileType.ORIG_TARBALL)
> > +        self.assertEquals(
> > +            determine_source_file_type('foo_1.0.tar.gz'),
> > +            SourcePackageFileType.NATIVE_TARBALL)
> > +
> >      def testPrefixMultilineString(self):
> >          """lp.archiveuploader.utils.prefix_multi_line_string should work"""
> >          from lp.archiveuploader.utils import prefix_multi_line_string
> >
> > === modified file 'lib/lp/archiveuploader/utils.py'
> > --- lib/lp/archiveuploader/utils.py   2009-06-24 23:33:29 +0000
> > +++ lib/lp/archiveuploader/utils.py   2009-11-11 14:24:18 +0000
> > @@ -15,6 +15,8 @@
> >      're_valid_pkg_name',
> >      're_changes_file_name',
> >      're_extract_src_version',
> > +    'get_source_file_extension',
> > +    'determine_source_file_type',
> >      'prefix_multi_line_string',
> >      'safe_fix_maintainer',
> >      'ParseMaintError',
> > @@ -31,7 +33,15 @@
> >  re_taint_free = re.compile(r"^[-+~/\.\w]+$")
> >
> >  re_isadeb = re.compile(r"(.+?)_(.+?)_(.+)\.(u?d?deb)$")
> > -re_issource =
> re.compile(r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)$")
> > +
> > +re_issource = re.compile(
> > +    r"(.+)_(.+?)\."
> > +     "(orig\.tar\.gz"
> > +     "|diff\.gz"
> > +     "|tar\.gz"
> > +     "|dsc)$")
> 
> I think this would be clearer if you used the re.VERBOSE flag.
> 
> Also, consider something like the following:
> 
>     source_file_exts = ['orig.tar.gz', 'diff.gz', 'tar.gz', 'dsc']
>     re_issource = r"(.+)_(.+?)\.(%s)" % "|".join(
>         re.escape(ext) for ext in source_file_exts)
> 
> To me anyway, that seems easier to verify that it'll DTRT.

I've done that for now. It is cleaner, but will get a bit messier once I throw in the multiple compression formats later.

> > +re_is_orig_tar_ext = re.compile(r"^orig.tar.gz$")
> > +re_is_native_tar_ext = re.compile(r"^tar.gz$")
> >
> >  re_no_epoch = re.compile(r"^\d+\:")
> >  re_no_revision = re.compile(r"-[^-]+$")
> > @@ -44,6 +54,32 @@
> >  re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>")
> >
> >
> > +def get_source_file_extension(filename):
> > +    """Get the extension part of a source file name."""
> > +    match = re_issource.match(filename)
> > +    if match is None:
> > +        return None
> > +    return match.group(3)
> > +
> > +
> > +def determine_source_file_type(filename):
> > +    """Determine the SourcePackageFileType of the given filename."""
> > +    # Avoid circular imports.
> > +    from lp.registry.interfaces.sourcepackage import SourcePackageFileType
> > +
> > +    extension = get_source_file_extension(filename)
> > +    if extension is None:
> > +        return None
> > +    elif extension == "dsc":
> > +        return SourcePackageFileType.DSC
> > +    elif extension == "diff.gz":
> > +        return SourcePackageFileType.DIFF
> > +    elif re_is_orig_tar_ext.match(extension):
> > +        return SourcePackageFileType.ORIG_TARBALL
> > +    elif re_is_native_tar_ext.match(extension):
> > +        return SourcePackageFileType.NATIVE_TARBALL
> 
> Please can you add an else clause, if only to assert that it should
> never happen.

It should happen, and it should return None. I've done that explicitly, and added tests.

> > +
> > +
> >  def prefix_multi_line_string(str, prefix, include_blank_lines=0):
> >      """Utility function to split an input string and prefix,
> >
> >
> > === modified file 'lib/lp/registry/interfaces/distroseries.py'
> > --- lib/lp/registry/interfaces/distroseries.py        2009-11-07 16:14:22
> +0000
> > +++ lib/lp/registry/interfaces/distroseries.py        2009-11-11 14:24:18
> +0000
> > @@ -205,6 +205,12 @@
> >      def newMilestone(name, dateexpected=None, summary=None,
> code_name=None):
> >          """Create a new milestone for this DistroSeries."""
> >
> > +    def permitSourcePackageFormat(format):
> > +        """Permit a source format to be uploaded to this series.
> > +
> > +        :param format: The SourcePackageFormat to permit.
> > +        """
> > +
> >
> >  class ISeriesMixin(Interface):
> >      """Methods & properties shared between distro & product series."""
> > @@ -851,6 +857,12 @@
> >          :return: A string.
> >          """
> >
> > +    def isSourcePackageFormatPermitted(format):
> > +        """Check if the specified source format is allowed in this series.
> > +
> > +        :param format: The SourcePackageFormat to check.
> > +        """
> > +
> >
> >  class IDistroSeries(IDistroSeriesEditRestricted, IDistroSeriesPublic,
> >                      IStructuralSubscriptionTarget):
> >
> > === modified file 'lib/lp/registry/interfaces/sourcepackage.py'
> > --- lib/lp/registry/interfaces/sourcepackage.py       2009-11-07 09:50:37
> +0000
> > +++ lib/lp/registry/interfaces/sourcepackage.py       2009-11-11 14:24:18
> +0000
> > @@ -275,7 +275,7 @@
> >          which in turn lists the orig.tar.gz and diff.tar.gz files used to
> >          make up the package.  """)
> >
> > -    ORIG = DBItem(4, """
> > +    ORIG_TARBALL = DBItem(4, """
> >          Orig Tarball
> >
> >          This file is an Ubuntu "orig" file, typically an upstream tarball
> or
> > @@ -289,8 +289,8 @@
> >          diff creates additional directories with patches and documentation
> >          used to build the binary packages for Ubuntu.  """)
> >
> > -    TARBALL = DBItem(6, """
> > -        Tarball
> > +    NATIVE_TARBALL = DBItem(6, """
> > +        Native Tarball
> >
> >          This is a tarball, usually of a mixture of Ubuntu and upstream
> code,
> >          used in the build process for this source package.  """)
> >
> > === modified file 'lib/lp/registry/model/distroseries.py'
> > --- lib/lp/registry/model/distroseries.py     2009-11-07 16:14:22 +0000
> > +++ lib/lp/registry/model/distroseries.py     2009-11-11 14:24:18 +0000
> > @@ -82,6 +82,7 @@
> >  from lp.registry.model.sourcepackagename import SourcePackageName
> >  from lp.soyuz.model.sourcepackagerelease import (
> >      SourcePackageRelease)
> > +from lp.soyuz.model.sourcepackageformat import SourcePackageFormatSelection
> >  from lp.blueprints.model.specification import (
> >      HasSpecificationsMixin, Specification)
> >  from lp.translations.model.translationimportqueue import (
> > @@ -1496,7 +1497,7 @@
> >          cur = cursor()
> >
> >          # Perform the copies
> > -        self._copy_component_and_section_selections(cur)
> > +        self._copy_component_section_and_format_selections(cur)
> >
> >          # Prepare the list of distroarchseries for which binary packages
> >          # shall be copied.
> > @@ -1557,9 +1558,9 @@
> >                  PackagePublishingPocket.RELEASE)
> >              clone_packages(origin, destination, distroarchseries_list)
> >
> > -    def _copy_component_and_section_selections(self, cur):
> > -        """Copy the section and component selections from the parent distro
> > -        series into this one.
> > +    def _copy_component_section_and_format_selections(self, cur):
> > +        """Copy the section, component and format selections from the
> parent
> > +        distro series into this one.
> >          """
> >          # Copy the component selections
> >          cur.execute('''
> > @@ -1573,6 +1574,13 @@
> >              SELECT %s as distroseries, ss.section AS section
> >              FROM SectionSelection AS ss WHERE ss.distroseries = %s
> >              ''' % sqlvalues(self.id, self.parent_series.id))
> > +        # Copy the source format selections
> > +        cur.execute('''
> > +            INSERT INTO SourcePackageFormatSelection (distroseries, format)
> > +            SELECT %s as distroseries, spfs.format AS format
> > +            FROM SourcePackageFormatSelection AS spfs
> > +            WHERE spfs.distroseries = %s
> > +            ''' % sqlvalues(self.id, self.parent_series.id))
> >
> >      def copyTranslationsFromParent(self, transaction, logger=None):
> >          """See `IDistroSeries`."""
> > @@ -1739,6 +1747,16 @@
> >          else:
> >              return '%s%s' % (self.name, pocketsuffix[pocket])
> >
> > +    def isSourcePackageFormatPermitted(self, format):
> > +        return Store.of(self).find(
> > +            SourcePackageFormatSelection, distroseries=self,
> > +            format=format).count() == 1
> > +
> > +    def permitSourcePackageFormat(self, format):
> > +        if not self.isSourcePackageFormatPermitted(format):
> > +            return Store.of(self).add(
> > +                SourcePackageFormatSelection(self, format))
> > +
> >
> >  class DistroSeriesSet:
> >      implements(IDistroSeriesSet)
> >
> > === modified file 'lib/lp/soyuz/doc/archive.txt'
> > --- lib/lp/soyuz/doc/archive.txt      2009-11-09 13:01:13 +0000
> > +++ lib/lp/soyuz/doc/archive.txt      2009-11-11 14:24:18 +0000
> > @@ -850,7 +850,7 @@
> >
> >      >>> print_published_files(cprov_archive)
> >      cdrkit - 1.0: foobar-1.0.dsc (DSC, 716 bytes)
> > -    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
> > +    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560
> bytes)
> >      iceweasel - 1.0: iceweasel-1.0.dsc (DSC, 123 bytes)
> >
> >  Now we will emulate a duplicated reference to the same 'orig.tar.gz',
> > @@ -867,9 +867,9 @@
> >  'firefox_0.9.2.orig.tar.gz' file.
> >
> >      >>> print_published_files(cprov_archive)
> > -    cdrkit - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
> > +    cdrkit - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
> >      cdrkit - 1.0: foobar-1.0.dsc (DSC, 716 bytes)
> > -    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
> > +    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560
> bytes)
> >      iceweasel - 1.0: iceweasel-1.0.dsc (DSC, 123 bytes)
> >
> >  Similarly to what happen in the archive disk 'pool', where already
> >
> > === modified file 'lib/lp/soyuz/doc/initialise-from-parent.txt'
> > --- lib/lp/soyuz/doc/initialise-from-parent.txt       2009-10-26 18:40:04
> +0000
> > +++ lib/lp/soyuz/doc/initialise-from-parent.txt       2009-11-11 14:24:18
> +0000
> > @@ -172,3 +172,10 @@
> >    >>> pmount_source.sourcepackagerelease.getBuildByArch(
> >    ...    foobuntu['hppa'], ubuntu.main_archive) is None
> >    True
> > +
> > +initialiseFromParent also copies the permitted source formats from the
> > +parent series.
> > +
> > +  >>> from lp.soyuz.interfaces.sourcepackageformat import
> SourcePackageFormat
> > +  >>>
> foobuntu.isSourcePackageFormatPermitted(SourcePackageFormat.FORMAT_1_0)
> > +  True
> >
> > === added file 'lib/lp/soyuz/interfaces/sourcepackageformat.py'
> > --- lib/lp/soyuz/interfaces/sourcepackageformat.py    1970-01-01 00:00:00
> +0000
> > +++ lib/lp/soyuz/interfaces/sourcepackageformat.py    2009-11-11 14:24:18
> +0000
> > @@ -0,0 +1,52 @@
> > +# Copyright 2009 Canonical Ltd.  This software is licensed under the
> > +# GNU Affero General Public License version 3 (see the file LICENSE).
> > +
> > +"""Source package format interfaces."""
> > +
> > +__metaclass__ = type
> > +
> > +__all__ = [
> > +    'SourcePackageFormat',
> > +    'ISourcePackageFormatSelection',
> > +    ]
> > +
> > +from zope.interface import Attribute, Interface
> > +from lazr.enum import DBEnumeratedType, DBItem
> > +
> > +
> > +class SourcePackageFormat(DBEnumeratedType):
> > +    """Source package format
> > +
> > +    There are currently three formats of Debian source packages. The Format
> > +    field in the .dsc file must specify one of these formats.
> > +    """
> > +
> > +    FORMAT_1_0 = DBItem(0, """
> > +        1.0
> > +
> > +        Specifies either a native (having a single tar.gz) or non-native
> > +        (having an orig.tar.gz and a diff.gz) package. Supports only gzip
> > +        compression.
> > +        """)
> > +
> > +    FORMAT_3_0_QUILT = DBItem(1, """
> > +        3.0 (quilt)
> > +
> > +        Specifies a non-native package, with an orig.tar.* and a
> debian.tar.*.
> > +        Supports gzip and bzip2 compression.
> > +        """)
> > +
> > +    FORMAT_3_0_NATIVE = DBItem(2, """
> > +        3.0 (native)
> > +
> > +        Specifies a native package, with a single tar.*. Supports gzip and
> > +        bzip2 compression.
> > +        """)
> > +
> > +
> > +class ISourcePackageFormatSelection(Interface):
> > +    """A source package format allowed within a DistroSeries."""
> > +
> > +    id = Attribute("ID")
> > +    distroseries = Attribute("Target series")
> > +    format = Attribute("Permitted source package format")
> >
> > === modified file 'lib/lp/soyuz/model/queue.py'
> > --- lib/lp/soyuz/model/queue.py       2009-10-26 11:51:40 +0000
> > +++ lib/lp/soyuz/model/queue.py       2009-11-11 14:24:18 +0000
> > @@ -1468,7 +1468,8 @@
> >              published_sha1 = published_file.content.sha1
> >
> >              # Multiple orig(s) with the same content are fine.
> > -            if source_file.filetype == SourcePackageFileType.ORIG:
> > +            if source_file.filetype == (
> > +                SourcePackageFileType.ORIG_TARBALL):
> >                  if proposed_sha1 == published_sha1:
> >                      continue
> >                  raise QueueInconsistentStateError(
> >
> > === added file 'lib/lp/soyuz/model/sourcepackageformat.py'
> > --- lib/lp/soyuz/model/sourcepackageformat.py 1970-01-01 00:00:00 +0000
> > +++ lib/lp/soyuz/model/sourcepackageformat.py 2009-11-11 14:24:18 +0000
> > @@ -0,0 +1,35 @@
> > +# Copyright 2009 Canonical Ltd.  This software is licensed under the
> > +# GNU Affero General Public License version 3 (see the file LICENSE).
> > +
> > +__metaclass__ = type
> > +
> > +__all__ = [
> > +    'SourcePackageFormatSelection',
> > +    ]
> > +
> > +from storm.locals import Storm, Int, Reference
> > +from zope.interface import implements
> > +
> > +from canonical.database.enumcol import DBEnum
> > +from lp.soyuz.interfaces.sourcepackageformat import (
> > +    ISourcePackageFormatSelection, SourcePackageFormat)
> > +
> > +class SourcePackageFormatSelection(Storm):
> > +    """See ISourcePackageFormatSelection."""
> > +
> > +    implements(ISourcePackageFormatSelection)
> > +
> > +    def __init__(self, distroseries, format):
> > +        super(SourcePackageFormatSelection, self).__init__()
> > +        self.distroseries = distroseries
> > +        self.format = format
> > +
> > +    __storm_table__ = 'sourcepackageformatselection'
> > +
> > +    id = Int(primary=True)
> > +
> > +    distroseries_id = Int(name="distroseries")
> > +    distroseries = Reference(distroseries_id, 'DistroSeries.id')
> > +
> > +    format = DBEnum(enum=SourcePackageFormat)
> > +
> >
> > === modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
> > --- lib/lp/soyuz/model/sourcepackagerelease.py        2009-11-07 09:50:37
> +0000
> > +++ lib/lp/soyuz/model/sourcepackagerelease.py        2009-11-11 14:24:18
> +0000
> > @@ -36,6 +36,7 @@
> >  from lp.translations.interfaces.translationimportqueue import (
> >      ITranslationImportQueue)
> >  from canonical.launchpad.webapp.interfaces import NotFoundError
> > +from lp.archiveuploader.utils import determine_source_file_type
> >  from lp.soyuz.interfaces.archive import (
> >      ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
> >  from lp.soyuz.interfaces.build import BuildStatus
> > @@ -52,7 +53,7 @@
> >  from lp.soyuz.scripts.queue import QueueActionError
> >  from lp.registry.interfaces.person import validate_public_person
> >  from lp.registry.interfaces.sourcepackage import (
> > -    SourcePackageFileType, SourcePackageType, SourcePackageUrgency)
> > +    SourcePackageType, SourcePackageUrgency)
> >
> >
> >  def _filter_ubuntu_translation_file(filename):
> > @@ -271,19 +272,10 @@
> >
> >      def addFile(self, file):
> >          """See ISourcePackageRelease."""
> > -        determined_filetype = None
> > -        if file.filename.endswith(".dsc"):
> > -            determined_filetype = SourcePackageFileType.DSC
> > -        elif file.filename.endswith(".orig.tar.gz"):
> > -            determined_filetype = SourcePackageFileType.ORIG
> > -        elif file.filename.endswith(".diff.gz"):
> > -            determined_filetype = SourcePackageFileType.DIFF
> > -        elif file.filename.endswith(".tar.gz"):
> > -            determined_filetype = SourcePackageFileType.TARBALL
> > -
> > -        return SourcePackageReleaseFile(sourcepackagerelease=self,
> > -                                        filetype=determined_filetype,
> > -                                        libraryfile=file)
> > +        return SourcePackageReleaseFile(
> > +            sourcepackagerelease=self,
> > +            filetype=determine_source_file_type(file.filename),
> > +            libraryfile=file)
> >
> >      def _getPackageSize(self):
> >          """Get the size total (in KB) of files comprising this package.
> >
> > === modified file 'lib/lp/soyuz/scripts/packagecopier.py'
> > --- lib/lp/soyuz/scripts/packagecopier.py     2009-10-29 12:18:05 +0000
> > +++ lib/lp/soyuz/scripts/packagecopier.py     2009-11-11 14:24:18 +0000
> > @@ -36,6 +36,7 @@
> >      ISourcePackagePublishingHistory, active_publishing_status)
> >  from lp.soyuz.interfaces.queue import (
> >      IPackageUpload, IPackageUploadSet)
> > +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
> >  from lp.soyuz.scripts.ftpmasterbase import (
> >      SoyuzScript, SoyuzScriptError)
> >  from lp.soyuz.scripts.processaccepted import (
> > @@ -356,6 +357,14 @@
> >                  "Cannot copy to an unsupported distribution: %s." %
> >                  source.distroseries.distribution.name)
> >
> > +        format = SourcePackageFormat.getTermByToken(
> > +            source.sourcepackagerelease.dsc_format).value
> > +
> > +        if not series.isSourcePackageFormatPermitted(format):
> > +            raise CannotCopy(
> > +                "Source format '%s' not supported by target series %s." %
> > +                (source.sourcepackagerelease.dsc_format, series.name))
> > +
> >          if self.include_binaries:
> >              built_binaries = source.getBuiltBinaries()
> >              if len(built_binaries) == 0:
> >
> > === modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
> > --- lib/lp/soyuz/scripts/tests/test_copypackage.py    2009-10-05 18:29:12
> +0000
> > +++ lib/lp/soyuz/scripts/tests/test_copypackage.py    2009-11-11 14:24:18
> +0000
> > @@ -37,6 +37,7 @@
> >      PackagePublishingStatus, active_publishing_status)
> >  from lp.soyuz.interfaces.queue import (
> >      PackageUploadCustomFormat, PackageUploadStatus)
> > +from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
> >  from lp.soyuz.model.publishing import (
> >      SecureSourcePackagePublishingHistory,
> >      SecureBinaryPackagePublishingHistory)
> > @@ -720,6 +721,31 @@
> >              'Cannot copy to an unsupported distribution: ubuntu.',
> >              copy_checker.checkCopy, source, series, pocket)
> >
> > +    def test_checkCopy_respects_sourceformatselection(self):
> > +        # A source copy should be denied if the source's dsc_format is
> > +        # not permitted in the target series.
> > +
> > +        # Get hoary, and configure it to accept 3.0 (quilt) uploads.
> > +        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
> > +        hoary = ubuntu.getSeries('hoary')
> > +
> hoary.permitSourcePackageFormat(SourcePackageFormat.FORMAT_3_0_QUILT)
> > +
> > +        # Create a 3.0 (quilt) source.
> > +        source = self.test_publisher.getPubSource(
> > +            distroseries=hoary, dsc_format='3.0 (quilt)')
> > +
> > +        archive = source.archive
> > +        series = ubuntu.getSeries('warty')
> > +        pocket = source.pocket
> > +
> > +        # An attempt to copy the source to warty, which only supports
> > +        # 1.0 sources, is rejected.
> > +        copy_checker = CopyChecker(archive, include_binaries=True)
> > +        self.assertRaisesWithContent(
> > +            CannotCopy,
> > +            "Source format '3.0 (quilt)' not supported by target series "
> > +            "warty.", copy_checker.checkCopy, source, series, pocket)
> > +
> >      def test_checkCopy_identifies_conflicting_copy_candidates(self):
> >          # checkCopy() is able to identify conflicting candidates within
> >          # the copy batch.
> >

Revision history for this message

Gavin Panella (allenap) wrote on 2009-11-12:

On Wed, 11 Nov 2009 21:53:34 -0000
William Grant <email address hidden> wrote:

> Hi Gavin,
>
> Thanks for the review.
>
> > Hi William,
> >
> > As Julian has already reviewed the logic in this branch, I'll just do
> > a style/convention review.
> >
> > I really have very little to say, and that which I have said is pretty
> > trivial. It's inline with the diff below.
> >
> > Running `make lint` generated a lot of warnings. Please can you clean
> > up those that make sense.
>
> I don't think any of those are actually mine, and I felt my diff was big enough. If you think I should clean them up anyway, I will.

It's not essential, but in general it's good to clean up while moving
through the tree because there's a lot of crud from before we
cared. If you do feel energetic enough to sort some of them out
(anything is better than nothing), then do it in a follow-on branch,
and just ask for a sanity-check review before landing it.

Gavin.

Revision history for this message

William Grant (wgrant) wrote on 2009-11-12:

Hi Julian,

On Wed, 2009-11-11 at 21:30 +0000, William Grant wrote:
> > Hi William, thanks for making this change. There's some much-needed
> > refactoring and clearing up in nascentupload.
> >
> > The basic direction is good, I just have a few comments to make for things
> > that need fixing. Gavin will do a more thorough review as we agreed on IRC.
> >
> > General questions:
> >
> > * I can't tell from the diff but are the db permissions added for the new
> > table correctly tested in the tests? This usually just means ensuring that
> > the test runs as the correct db user.
>
> I'll have to look at that later. I'm not quite sure.

I'm not entirely sure how to check this, but I would really hope that
the upload and copy code paths were already executed as the relevant
users at some point in the test suite.

> > * The XXX about the orphaned files is interesting. I don't think we deal
> > with this right now do we? I'm trying to think if it would be bad to reject
> > the upload if we detect orphan files, and I can't think of one. What's your
> > opinion?
>
> I think there is a word or two missing there. You mean you can't think of a reason that it would be bad, or that it wouldn't be bad?
>
> I can't see any compelling reason to reject if it has extra files, apart from it seeming slightly cleaner. If you feel it needs to be done, it's probably easy enough to add.

As discussed on IRC, I've removed the XXX.

> > Things that need fixing:
> >
> > * The upload format check is not tested. (The "%s: format '%s' is not
> > permitted in %s." one)
>
> Ah, yes, forgot about that. The other half of the branch has 3.0 format test source packages, and tests that. I suppose I should bring one of those in.

I've created a 3.0 (quilt) source package and brought across the
relevant test from the second branch.

> > * IDistroSeries methods permitSourcePackageFormat() and
> > isSourcePackageFormatPermitted() should be in a utility, e.g.
> > SourcePackageFormatSet. This ensures that in a zopeful environment they are
> > security wrapped. Although the upload processor is zopeless, we might need to
> > do that one day. Something like
> > * SourcePackageFormatSet.add()
> > * SourcePackageFormatSet.getByFormat()
> > would fit with our current style. You can keep the
> > isSourcePackageFormatPermitted() and make it call the utility method as a
> > convenience, but the permitSourcePackageFormat() should go.
> >
> > * Once that's done, you should remove the __init__ on the SourcePackageFormat
> > model class and make the new utility's add() method initialise the correct
> > fields.
>
> OK, sure. Will fix.

Fixed.

The intermediate diff is attached.

Hi Julian,

On Wed, 2009-11-11 at 21:30 +0000, William Grant wrote:
> > Hi William, thanks for making this change.  There's some much-needed
> > refactoring and clearing up in nascentupload.
> > 
> > The basic direction is good, I just have a few comments to make for things
> > that need fixing.  Gavin will do a more thorough review as we agreed on IRC.
> > 
> > General questions:
> > 
> >  * I can't tell from the diff but are the db permissions added for the new
> > table correctly tested in the tests?  This usually just means ensuring that
> > the test runs as the correct db user.
> 
> I'll have to look at that later. I'm not quite sure.

I'm not entirely sure how to check this, but I would really hope that
the upload and copy code paths were already executed as the relevant
users at some point in the test suite.

> >  * The XXX about the orphaned files is interesting.  I don't think we deal
> > with this right now do we?  I'm trying to think if it would be bad to reject
> > the upload if we detect orphan files, and I can't think of one.  What's your
> > opinion?
> 
> I think there is a word or two missing there. You mean you can't think of a reason that it would be bad, or that it wouldn't be bad?
> 
> I can't see any compelling reason to reject if it has extra files, apart from it seeming slightly cleaner. If you feel it needs to be done, it's probably easy enough to add.

As discussed on IRC, I've removed the XXX.

> > Things that need fixing:
> > 
> >  * The upload format check is not tested. (The "%s: format '%s' is not
> > permitted in %s." one)
> 
> Ah, yes, forgot about that. The other half of the branch has 3.0 format test source packages, and tests that. I suppose I should bring one of those in.

I've created a 3.0 (quilt) source package and brought across the
relevant test from the second branch.

> >  * IDistroSeries methods permitSourcePackageFormat() and
> > isSourcePackageFormatPermitted() should be in a utility, e.g.
> > SourcePackageFormatSet.  This ensures that in a zopeful environment they are
> > security wrapped.  Although the upload processor is zopeless, we might need to
> > do that one day.  Something like
> >    * SourcePackageFormatSet.add()
> >    * SourcePackageFormatSet.getByFormat()
> >    would fit with our current style.  You can keep the
> > isSourcePackageFormatPermitted() and make it call the utility method as a
> > convenience, but the permitSourcePackageFormat() should go.
> > 
> >  * Once that's done, you should remove the __init__ on the SourcePackageFormat
> > model class and make the new utility's add() method initialise the correct
> > fields.
> 
> OK, sure. Will fix.

Fixed.

The intermediate diff is attached.

9850-9857.diff

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2009-11-14:

Looking good, thanks William. I will land this for you.

review: Approve (code)

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2009-11-14:

William, I can't land this, it's failing in deathrow.txt.

Revision history for this message

William Grant (wgrant) wrote on 2009-11-14:

Julian, I've fixed the broken tests.

Revision history for this message

Curtis Hovey (sinzui) wrote on 2009-11-15:

> Julian, I've fixed the broken tests.

I'll submit the branch.

Revision history for this message

William Grant (wgrant) wrote on 2009-11-17:

So, it turns out this needs to land on db-devel. I've merged and resolved conflicts, with no other changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Barki Mustapha

Celso Providelo

Christian Reis

Christy Awad

Colin Watson

Harpianto,ANDI

James Troup

John A Meinel

Kevin bush

Launchpad code reviewers

Launchpad code reviewers from Canonical

Matthew Tanner

Maximiliano Bertacchini

Oguz Ersoz

Simon Brakhane

Ubuntu-BR DevOps

William Grant

alhawiti

api.ng

pedro cavazos

todaioan

wenjingwen

to status/vote changes:

Tzaddi

Tzaddi Belding

 === modified file 'database/schema/security.cfg'
 --- database/schema/security.cfg	2009-11-10 13:09:26 +0000
 +++ database/schema/security.cfg	2009-11-11 21:34:02 +0000
@@ -987,8 +987,8 @@
  public.section                          = SELECT, INSERT, UPDATE
  public.sectionselection                 = SELECT, INSERT, UPDATE
  public.signedcodeofconduct              = SELECT, INSERT, UPDATE
++public.sourcepackagefilepublishing      = SELECT, INSERT, UPDATE
  public.sourcepackageformatselection     = SELECT, INSERT
--public.sourcepackagefilepublishing      = SELECT, INSERT, UPDATE
  public.sourcepackagename                = SELECT, INSERT, UPDATE
  public.sourcepackagepublishinghistory   = SELECT
  public.securesourcepackagepublishinghistory = SELECT, INSERT, UPDATE
 === modified file 'lib/lp/archiveuploader/nascentupload.py'
 --- lib/lp/archiveuploader/nascentupload.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/archiveuploader/nascentupload.py	2009-11-12 11:44:36 +0000
@@ -325,9 +325,6 @@
          # It is never sane to upload more than one source at a time.
--        # XXX: What about orphaned files? How will that work?
--        #      I think we might need to verify that all source files are
--        #      claimed by a dsc.
          if dsc > 1:
              self.reject("Changes file lists more than one .dsc")
 === added directory 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt'
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.debian.tar.gz'
 Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.debian.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.debian.tar.gz	2009-11-12 11:51:53 +0000 differ
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc'
 --- lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc	1970-01-01 00:00:00 +0000
 +++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc	2009-11-12 11:51:53 +0000
@@ -0,0 +1,16 @@
++Format: 3.0 (quilt)
++Source: bar
++Binary: bar
++Architecture: any
++Version: 1.0-1
++Maintainer: Launchpad team <launchpad@lists.canonical.com>
++Standards-Version: 3.6.2
++Checksums-Sha1:
++ 73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
++ abce262314a7c0ca00e43598f21b41a3e6ff6b21 688 bar_1.0-1.debian.tar.gz
++Checksums-Sha256:
++ f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
++ ffdcce60fca14618f68483ca77a206f332a3773dc7ece1c3e6de55c0118c69c6 688 bar_1.0-1.debian.tar.gz
++Files:
++ fc1464e5985b962a042d5354452f361d 164 bar_1.0.orig.tar.gz
++ 056db4dfe7de8322296b6d417592ee01 688 bar_1.0-1.debian.tar.gz
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes'
 --- lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes	1970-01-01 00:00:00 +0000
 +++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes	2009-11-12 11:51:54 +0000
@@ -0,0 +1,28 @@
++Format: 1.8
++Date: Thu, 16 Feb 2006 15:34:09 +0000
++Source: bar
++Binary: bar
++Architecture: source
++Version: 1.0-1
++Distribution: breezy
++Urgency: low
++Maintainer: Launchpad team <launchpad@lists.canonical.com>
++Changed-By: Daniel Silverstone <daniel.silverstone@canonical.com>
++Description:
++ bar        - Stuff for testing
++Changes:
++ bar (1.0-1) breezy; urgency=low
++ .
++   * Initial version
++Checksums-Sha1:
++ bc97e185cf31af33bf8d109044ce51f32d09c229 645 bar_1.0-1.dsc
++ 73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
++ abce262314a7c0ca00e43598f21b41a3e6ff6b21 688 bar_1.0-1.debian.tar.gz
++Checksums-Sha256:
++ ae0fb16941a95518332a8ee962d00d55963b491c2df94b3f230a65d2bdbeedf8 645 bar_1.0-1.dsc
++ f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
++ ffdcce60fca14618f68483ca77a206f332a3773dc7ece1c3e6de55c0118c69c6 688 bar_1.0-1.debian.tar.gz
++Files:
++ c320d2827f08f09ec2e1bbbac635225c 645 devel optional bar_1.0-1.dsc
++ fc1464e5985b962a042d5354452f361d 164 devel optional bar_1.0.orig.tar.gz
++ 056db4dfe7de8322296b6d417592ee01 688 devel optional bar_1.0-1.debian.tar.gz
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz'
 Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz	2009-11-12 11:47:52 +0000 differ
 === modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
 --- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-12 11:49:00 +0000
@@ -49,7 +49,8 @@
  from lp.soyuz.interfaces.archivepermission import (
      ArchivePermissionType, IArchivePermissionSet)
  from lp.soyuz.interfaces.component import IComponentSet
--from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelectionSet, SourcePackageFormat)
  from lp.registry.interfaces.person import IPersonSet
  from lp.registry.interfaces.sourcepackagename import (
      ISourcePackageNameSet)
@@ -192,7 +193,9 @@
              permitted_formats = [SourcePackageFormat.FORMAT_1_0]
          for format in permitted_formats:
--            self.breezy.permitSourcePackageFormat(format)
++            if not self.breezy.isSourcePackageFormatPermitted(format):
++                getUtility(ISourcePackageFormatSelectionSet).add(
++                    self.breezy, format)
      def addMockFile(self, filename, content="anything"):
          """Return a librarian file."""
@@ -1404,6 +1407,28 @@
+             ]
          self.assertEmail(contents, recipients=recipients)
++    def test30QuiltUploadToUnsupportingSeriesIsRejected(self):
++        """Ensure that uploads to series without format support are rejected.
++
++        Series can restrict the source formats that they accept. Uploads
++        should be rejected if an unsupported format is uploaded.
++        """
++        self.setupBreezy()
++        self.layer.txn.commit()
++        self.options.context = 'absolutely-anything'
++        uploadprocessor = UploadProcessor(
++            self.options, self.layer.txn, self.log)
++
++        # Upload the source.
++        upload_dir = self.queueUpload("bar_1.0-1_3.0-quilt")
++        self.processUpload(uploadprocessor, upload_dir)
++        # Make sure it was rejected.
++        from_addr, to_addrs, raw_msg = stub.test_emails.pop()
++        self.assertTrue(
++            "bar_1.0-1.dsc: format '3.0 (quilt)' is not permitted in "
++            "breezy." in raw_msg,
++            "Source was not rejected properly:\n%s" % raw_msg)
++
  def test_suite():
      return unittest.TestLoader().loadTestsFromName(__name__)
 === modified file 'lib/lp/archiveuploader/tests/test_utils.py'
 --- lib/lp/archiveuploader/tests/test_utils.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/archiveuploader/tests/test_utils.py	2009-11-11 21:49:51 +0000
@@ -24,17 +24,19 @@
          from lp.archiveuploader.utils import determine_source_file_type
          self.assertEquals(
--            determine_source_file_type('foo_1.0-1.dsc'),
--            SourcePackageFileType.DSC)
--        self.assertEquals(
--            determine_source_file_type('foo_1.0-1.diff.gz'),
--            SourcePackageFileType.DIFF)
--        self.assertEquals(
--            determine_source_file_type('foo_1.0.orig.tar.gz'),
--            SourcePackageFileType.ORIG_TARBALL)
--        self.assertEquals(
--            determine_source_file_type('foo_1.0.tar.gz'),
--            SourcePackageFileType.NATIVE_TARBALL)
++            SourcePackageFileType.DSC,
++            determine_source_file_type('foo_1.0-1.dsc'))
++        self.assertEquals(
++            SourcePackageFileType.DIFF,
++            determine_source_file_type('foo_1.0-1.diff.gz'))
++        self.assertEquals(
++            SourcePackageFileType.ORIG_TARBALL,
++            determine_source_file_type('foo_1.0.orig.tar.gz'))
++        self.assertEquals(
++            SourcePackageFileType.NATIVE_TARBALL,
++            determine_source_file_type('foo_1.0.tar.gz'))
++        self.assertEquals(None, determine_source_file_type('foo_1.0'))
++        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
      def testPrefixMultilineString(self):
          """lp.archiveuploader.utils.prefix_multi_line_string should work"""
 === modified file 'lib/lp/archiveuploader/utils.py'
 --- lib/lp/archiveuploader/utils.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/archiveuploader/utils.py	2009-11-11 21:49:20 +0000
@@ -34,12 +34,11 @@
  re_isadeb = re.compile(r"(.+?)_(.+?)_(.+)\.(u?d?deb)$")
++source_file_exts = ['orig.tar.gz', 'diff.gz', 'tar.gz', 'dsc']
  re_issource = re.compile(
--    r"(.+)_(.+?)\."
--     "(orig\.tar\.gz"
--     "|diff\.gz"
--     "|tar\.gz"
--     "|dsc)$")
++    r"(.+)_(.+?)\.(%s)" % "|".join(
++        re.escape(ext) for ext in source_file_exts))
++
  re_is_orig_tar_ext = re.compile(r"^orig.tar.gz$")
  re_is_native_tar_ext = re.compile(r"^tar.gz$")
@@ -78,6 +77,8 @@
          return SourcePackageFileType.ORIG_TARBALL
      elif re_is_native_tar_ext.match(extension):
          return SourcePackageFileType.NATIVE_TARBALL
++    else:
++        return None
  def prefix_multi_line_string(str, prefix, include_blank_lines=0):
 === modified file 'lib/lp/registry/interfaces/distroseries.py'
 --- lib/lp/registry/interfaces/distroseries.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/registry/interfaces/distroseries.py	2009-11-12 11:00:33 +0000
@@ -205,12 +205,6 @@
      def newMilestone(name, dateexpected=None, summary=None, code_name=None):
          """Create a new milestone for this DistroSeries."""
--    def permitSourcePackageFormat(format):
--        """Permit a source format to be uploaded to this series.
--
--        :param format: The SourcePackageFormat to permit.
--        """
--
  class ISeriesMixin(Interface):
      """Methods & properties shared between distro & product series."""
 === modified file 'lib/lp/registry/model/distroseries.py'
 --- lib/lp/registry/model/distroseries.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/registry/model/distroseries.py	2009-11-12 11:34:49 +0000
@@ -82,7 +82,6 @@
  from lp.registry.model.sourcepackagename import SourcePackageName
  from lp.soyuz.model.sourcepackagerelease import (
      SourcePackageRelease)
--from lp.soyuz.model.sourcepackageformat import SourcePackageFormatSelection
  from lp.blueprints.model.specification import (
      HasSpecificationsMixin, Specification)
  from lp.translations.model.translationimportqueue import (
@@ -119,6 +118,8 @@
  from canonical.launchpad.webapp.interfaces import (
      IStoreSelector, MAIN_STORE, NotFoundError, SLAVE_FLAVOR,
      TranslationUnavailable)
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelectionSet)
  class SeriesMixin:
@@ -1744,14 +1745,8 @@
              return '%s%s' % (self.name, pocketsuffix[pocket])
      def isSourcePackageFormatPermitted(self, format):
--        return Store.of(self).find(
--            SourcePackageFormatSelection, distroseries=self,
--            format=format).count() == 1
--
--    def permitSourcePackageFormat(self, format):
--        if not self.isSourcePackageFormatPermitted(format):
--            return Store.of(self).add(
--                SourcePackageFormatSelection(self, format))
++        return getUtility(ISourcePackageFormatSelectionSet
++            ).getBySeriesAndFormat(self, format) is not None
  class DistroSeriesSet:
 === modified file 'lib/lp/soyuz/configure.zcml'
 --- lib/lp/soyuz/configure.zcml	2009-10-30 06:28:19 +0000
 +++ lib/lp/soyuz/configure.zcml	2009-11-12 10:49:55 +0000
@@ -791,6 +791,28 @@
              interface="lp.soyuz.interfaces.section.ISectionSet"/>
      </securedutility>
++    <!-- SourcePackageFormatSelection -->
++
++    <class
++        class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelection">
++        <allow
++            interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelection"/>
++    </class>
++
++    <!-- SourcePackageFormatSelectionSet -->
++
++    <class
++        class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelectionSet">
++        <allow
++            interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet"/>
++    </class>
++    <securedutility
++        class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelectionSet"
++        provides="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet">
++        <allow
++            interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet"/>
++    </securedutility>
++
      <!-- SourcePackageReleaseFile -->
      <class
 === modified file 'lib/lp/soyuz/interfaces/sourcepackageformat.py'
 --- lib/lp/soyuz/interfaces/sourcepackageformat.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/soyuz/interfaces/sourcepackageformat.py	2009-11-12 10:46:22 +0000
@@ -8,6 +8,7 @@
  __all__ = [
      'SourcePackageFormat',
      'ISourcePackageFormatSelection',
++    'ISourcePackageFormatSelectionSet',
+     ]
  from zope.interface import Attribute, Interface
@@ -50,3 +51,14 @@
      id = Attribute("ID")
      distroseries = Attribute("Target series")
      format = Attribute("Permitted source package format")
++
++
++class ISourcePackageFormatSelectionSet(Interface):
++    """Set manipulation tools for the SourcePackageFormatSelection table."""
++
++    def getBySeriesAndFormat(distroseries, format):
++        """Return the ISourcePackageFormatSelection for the given series and
++        format."""
++
++    def add(distroseries, format):
++        """Allow the given source package format in the given series."""
 === modified file 'lib/lp/soyuz/model/sourcepackageformat.py'
 --- lib/lp/soyuz/model/sourcepackageformat.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/soyuz/model/sourcepackageformat.py	2009-11-12 11:02:48 +0000
@@ -5,25 +5,26 @@
  __all__ = [
      'SourcePackageFormatSelection',
++    'SourcePackageFormatSelectionSet',
+     ]
  from storm.locals import Storm, Int, Reference
++from zope.component import getUtility
  from zope.interface import implements
++from canonical.launchpad.webapp.interfaces import (
++    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR, MASTER_FLAVOR)
  from canonical.database.enumcol import DBEnum
  from lp.soyuz.interfaces.sourcepackageformat import (
--    ISourcePackageFormatSelection, SourcePackageFormat)
++    ISourcePackageFormatSelection, ISourcePackageFormatSelectionSet,
++    SourcePackageFormat)
++
  class SourcePackageFormatSelection(Storm):
      """See ISourcePackageFormatSelection."""
      implements(ISourcePackageFormatSelection)
--    def __init__(self, distroseries, format):
--        super(SourcePackageFormatSelection, self).__init__()
--        self.distroseries = distroseries
--        self.format = format
--
      __storm_table__ = 'sourcepackageformatselection'
      id = Int(primary=True)
@@ -33,3 +34,23 @@
      format = DBEnum(enum=SourcePackageFormat)
++
++class SourcePackageFormatSelectionSet:
++    """See ISourcePackageFormatSelectionSet."""
++
++    implements(ISourcePackageFormatSelectionSet)
++
++    def getBySeriesAndFormat(self, distroseries, format):
++        """See `ISourcePackageFormatSelection`."""
++        return getUtility(IStoreSelector).get(
++            MAIN_STORE, DEFAULT_FLAVOR).find(
++                SourcePackageFormatSelection, distroseries=distroseries,
++                format=format).one()
++
++    def add(self, distroseries, format):
++        """See `ISourcePackageFormatSelection`."""
++        spfs = SourcePackageFormatSelection()
++        spfs.distroseries = distroseries
++        spfs.format = format
++        return getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR).add(
++            spfs)
 === modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
 --- lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-11-10 13:09:26 +0000
 +++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-11-12 11:18:42 +0000
@@ -37,7 +37,8 @@
      PackagePublishingStatus, active_publishing_status)
  from lp.soyuz.interfaces.queue import (
      PackageUploadCustomFormat, PackageUploadStatus)
--from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelectionSet, SourcePackageFormat)
  from lp.soyuz.model.publishing import (
      SecureSourcePackagePublishingHistory,
      SecureBinaryPackagePublishingHistory)
@@ -728,7 +729,8 @@
          # Get hoary, and configure it to accept 3.0 (quilt) uploads.
          ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
          hoary = ubuntu.getSeries('hoary')
--        hoary.permitSourcePackageFormat(SourcePackageFormat.FORMAT_3_0_QUILT)
++        getUtility(ISourcePackageFormatSelectionSet).add(
++            hoary, SourcePackageFormat.FORMAT_3_0_QUILT)
          # Create a 3.0 (quilt) source.
          source = self.test_publisher.getPubSource(

 === modified file 'database/sampledata/current-dev.sql'
 --- database/sampledata/current-dev.sql	2009-11-09 13:01:13 +0000
 +++ database/sampledata/current-dev.sql	2009-11-16 23:27:14 +0000
@@ -745,6 +745,15 @@
++
++
++
++
++
++
++
++
++
  ALTER TABLE account DISABLE TRIGGER ALL;
  INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (1, '2005-06-06 08:59:51.591618', 8, 20, '2005-06-06 08:59:51.591618', 'Mark Shuttleworth', 'mark_oid', NULL, '123/mark');
@@ -1695,10 +1704,19 @@
  ALTER TABLE builder ENABLE TRIGGER ALL;
++ALTER TABLE buildpackagejob DISABLE TRIGGER ALL;
++
++INSERT INTO buildpackagejob (id, job, build) VALUES (1, 1, 8);
++INSERT INTO buildpackagejob (id, job, build) VALUES (2, 2, 11);
++
++
++ALTER TABLE buildpackagejob ENABLE TRIGGER ALL;
++
++
  ALTER TABLE buildqueue DISABLE TRIGGER ALL;
--INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (1, 8, 1, 'Dummy sampledata entry, not processing', '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', 1, false);
--INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (2, 11, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, 10, false);
++INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, 1, 1);
++INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (2, NULL, NULL, 10, false, 2, 1);
  ALTER TABLE buildqueue ENABLE TRIGGER ALL;
@@ -2781,6 +2799,8 @@
  ALTER TABLE job DISABLE TRIGGER ALL;
++INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (1, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', NULL);
++INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (2, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, NULL);
  ALTER TABLE job ENABLE TRIGGER ALL;
@@ -4615,6 +4635,13 @@
  ALTER TABLE packageset ENABLE TRIGGER ALL;
++ALTER TABLE packagesetgroup DISABLE TRIGGER ALL;
++
++
++
++ALTER TABLE packagesetgroup ENABLE TRIGGER ALL;
++
++
  ALTER TABLE packagesetinclusion DISABLE TRIGGER ALL;
@@ -8569,6 +8596,26 @@
  ALTER TABLE signedcodeofconduct ENABLE TRIGGER ALL;
++ALTER TABLE sourcepackageformatselection DISABLE TRIGGER ALL;
++
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (1, 1, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (2, 2, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (3, 3, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (4, 4, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (5, 5, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (6, 6, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (7, 7, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (8, 8, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (9, 9, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (10, 10, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (11, 11, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (12, 12, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (13, 13, 0);
++
++
++ALTER TABLE sourcepackageformatselection ENABLE TRIGGER ALL;
++
++
  ALTER TABLE sourcepackagename DISABLE TRIGGER ALL;
  INSERT INTO sourcepackagename (id, name) VALUES (1, 'mozilla-firefox');
@@ -8596,17 +8643,17 @@
  ALTER TABLE sourcepackagerelease DISABLE TRIGGER ALL;
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (14, 1, '0.9', '2004-09-27 11:57:13', 1, NULL, 1, 'Mozilla dummy Changelog......', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1), pmount', 'bacula-common (= 1.34.6-2), bacula-director-common (= 1.34.6-2), postgresql-client (>= 7.4), pmount', 'any', NULL, 1, 1, 1, 1, 1, 'Mark Shuttleworth <mark@canonical.com>', '3.6.2', '1.0', 'mozilla-firefox', 1, NULL, 'gcc-4.0, pmount', 'gcc-4.0-base, pmount');
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (15, 1, '1.0', '2004-09-27 11:57:13', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 2, 1, 9, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (16, 1, '1.0-1', '2005-03-10 16:30:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 3, 1, 10, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (17, 1, '0.99.6-1', '2005-03-14 18:00:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 2, 1, 10, 1, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (15, 1, '1.0', '2004-09-27 11:57:13', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 2, 1, 9, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (16, 1, '1.0-1', '2005-03-10 16:30:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 3, 1, 10, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (17, 1, '0.99.6-1', '2005-03-14 18:00:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 2, 1, 10, 1, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (20, 1, '0.1-1', '2005-03-24 20:59:31.439579', 1, NULL, 1, 'pmount (0.1-1) hoary; urgency=low
   * Fix description (Malone #1)
   * Fix debian (Debian #2000)
   * Fix warty (Warty Ubuntu #1)
-- -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 2, 1, 14, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (21, 1, '0.1-2', '2005-06-24 20:59:31.439579', 1, NULL, 1, 'This is a placeholder changelog for pmount 0.1-2', NULL, NULL, 'powerpc', NULL, 1, 1, 14, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++ -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 2, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (21, 1, '0.1-2', '2005-06-24 20:59:31.439579', 1, NULL, 1, 'This is a placeholder changelog for pmount 0.1-2', NULL, NULL, 'powerpc', NULL, 1, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (23, 1, '1.0.8-1ubuntu1', '2005-02-03 08:50:00', 1, NULL, 1, 'alsa-utils (1.0.8-1ubuntu1) warty; urgency=low
   * Placeholder
@@ -8616,7 +8663,7 @@
   * Placeholder
--     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'any', NULL, 2, 1, 19, 8, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'any', NULL, 2, 1, 19, 8, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (25, 1, '1.0.9a-4ubuntu1', '2005-08-01 14:10:00', 1, NULL, 1, 'alsa-utils (1.0.9a-4ubuntu1) hoary; urgency=low
   * Placeholder
@@ -8626,21 +8673,21 @@
   LP: #7, #8,
     #11
--     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 16, 19, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (26, 1, 'cr.g7-37', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 20, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 16, 19, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (26, 1, 'cr.g7-37', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 20, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (27, 1, 'b8p', '2006-02-10 11:19:00', 1, NULL, 1, 'libstdc++ (9.9-1) hoary; urgency=high
   * Placeholder
-- -- Sample Person <test@canonical.com> Tue, 10 Feb 2006 10:10:08 +0300', NULL, NULL, 'powerpc i386', NULL, 1, 16, 21, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (28, 1, '2.6.15.3', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 22, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (29, 1, '0.00', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 17, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (30, 1, '1.0', '2006-09-28 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (31, 1, '1.0', '2006-09-28 18:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (32, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 23, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (33, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 24, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (34, 1, '1.0', '2007-02-15 14:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 29, 16, 25, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (35, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 26, 1, 1, NULL, NULL, NULL, NULL, 10, NULL, NULL, NULL);
++ -- Sample Person <test@canonical.com> Tue, 10 Feb 2006 10:10:08 +0300', NULL, NULL, 'powerpc i386', NULL, 1, 16, 21, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (28, 1, '2.6.15.3', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 22, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (29, 1, '0.00', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 17, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (30, 1, '1.0', '2006-09-28 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (31, 1, '1.0', '2006-09-28 18:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (32, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 23, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (33, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 24, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (34, 1, '1.0', '2007-02-15 14:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 29, 16, 25, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (35, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 10, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (36, 243606, '1.0-1', '2007-08-09 21:25:37.832976', 1, NULL, 5, 'commercialpackage (1.0-1) breezy; urgency=low
    * Initial version
@@ -8666,7 +8713,7 @@
 F4bEPeRcnUjCFI/hjR0kxg=
  =Tjln
  ', 7, 243606, 27, 10, 1, 'Julian Edwards <launchpad@julian-edwards.com>', '3.6.2', '1.0', 'commercialpackage', 12, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (37, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 26, 1, 1, NULL, NULL, NULL, NULL, 11, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (37, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 11, NULL, NULL, NULL);
  ALTER TABLE sourcepackagerelease ENABLE TRIGGER ALL;
 === modified file 'database/sampledata/current.sql'
 --- database/sampledata/current.sql	2009-11-05 10:51:36 +0000
 +++ database/sampledata/current.sql	2009-11-16 23:27:14 +0000
@@ -745,6 +745,15 @@
++
++
++
++
++
++
++
++
++
  ALTER TABLE account DISABLE TRIGGER ALL;
  INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (11, '2005-06-06 08:59:51.591618', 8, 20, '2005-06-06 08:59:51.591618', 'Mark Shuttleworth', 'mark_oid', NULL, '123/mark');
@@ -949,20 +958,20 @@
  ALTER TABLE archive DISABLE TRIGGER ALL;
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (1, 17, NULL, true, NULL, 1, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:12.241774', 15, 1, 8, 5, 1, '2008-09-23 17:29:03.442606', NULL, NULL, NULL, 'Primary Archive for Ubuntu Linux', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (2, 1, NULL, true, NULL, 2, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.863812', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.445921', NULL, NULL, NULL, 'Primary Archive for Redhat Advanced Server', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (3, 1, NULL, true, NULL, 3, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.864941', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.446557', NULL, NULL, NULL, 'Primary Archive for Debian GNU/Linux', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (4, 1, NULL, true, NULL, 4, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.865502', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.44689', NULL, NULL, NULL, 'Primary Archive for The Gentoo Linux', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (5, 1, NULL, true, NULL, 5, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866015', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447202', NULL, NULL, NULL, 'Primary Archive for Kubuntu - Free KDE-based Linux', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (7, 4, NULL, true, NULL, 7, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866529', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447515', NULL, NULL, NULL, 'Primary Archive for GuadaLinex: Linux for Andalucia', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (8, 17, NULL, true, NULL, 8, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.867154', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447851', NULL, NULL, NULL, 'Primary Archive for Ubuntu Test', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (9, 28, 'packages to help my friends.', true, 1024, 1, 2, false, 3, 3, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.867684', 4, 0, 3, 1, 0, '2008-09-23 17:29:03.448178', NULL, NULL, NULL, 'PPA for Celso Providelo', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (10, 1, 'packages to help the humanity (you know, ubuntu)', true, 1024, 1, 2, false, 1, 1, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868202', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.448488', NULL, NULL, NULL, 'PPA for Mark Shuttleworth', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (11, 52, 'I am not allowed to say, I have no privs.', true, 1024, 1, 2, false, 0, 0, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868709', 1, 0, 0, 1, 0, '2008-09-23 17:29:03.448797', NULL, NULL, NULL, 'PPA for No Privileges Person', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (12, 17, 'Partner archive', true, NULL, 1, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869209', 1, 0, 1, 0, 0, '2008-09-23 17:29:03.449157', NULL, NULL, NULL, 'Partner Archive for Ubuntu Linux', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (13, 17, 'Partner archive', true, NULL, 8, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869732', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.449471', NULL, NULL, NULL, 'Partner Archive for Ubuntu Test', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (14, 17, 'Sample copy archive', true, NULL, 8, 6, false, NULL, NULL, NULL, NULL, NULL, false, 'samplecopyarchive', false, '2008-11-19 18:15:15.869732', 0, 0, 0, 0, 0, '2008-11-18 17:29:03.449471', NULL, NULL, NULL, 'Copy archive samplecopyarchive for Ubuntu Team', 0);
--INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (15, 17, 'Debug archive', true, NULL, 1, 7, false, NULL, NULL, NULL, NULL, NULL, false, 'debug', true, '2009-04-17 10:09:10.859746', 0, 0, 0, 0, 0, '2009-04-17 10:01:03.449876', NULL, NULL, NULL, 'Ubuntu DEBUG archive', 0);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (1, 17, NULL, true, NULL, 1, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:12.241774', 15, 1, 8, 5, 1, '2008-09-23 17:29:03.442606', NULL, NULL, NULL, 'Primary Archive for Ubuntu Linux', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (2, 1, NULL, true, NULL, 2, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.863812', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.445921', NULL, NULL, NULL, 'Primary Archive for Redhat Advanced Server', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (3, 1, NULL, true, NULL, 3, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.864941', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.446557', NULL, NULL, NULL, 'Primary Archive for Debian GNU/Linux', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (4, 1, NULL, true, NULL, 4, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.865502', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.44689', NULL, NULL, NULL, 'Primary Archive for The Gentoo Linux', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (5, 1, NULL, true, NULL, 5, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866015', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447202', NULL, NULL, NULL, 'Primary Archive for Kubuntu - Free KDE-based Linux', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (7, 4, NULL, true, NULL, 7, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866529', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447515', NULL, NULL, NULL, 'Primary Archive for GuadaLinex: Linux for Andalucia', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (8, 17, NULL, true, NULL, 8, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.867154', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447851', NULL, NULL, NULL, 'Primary Archive for Ubuntu Test', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (9, 28, 'packages to help my friends.', true, 1024, 1, 2, false, 3, 3, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.867684', 4, 0, 3, 1, 0, '2008-09-23 17:29:03.448178', NULL, NULL, NULL, 'PPA for Celso Providelo', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (10, 1, 'packages to help the humanity (you know, ubuntu)', true, 1024, 1, 2, false, 1, 1, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868202', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.448488', NULL, NULL, NULL, 'PPA for Mark Shuttleworth', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (11, 52, 'I am not allowed to say, I have no privs.', true, 1024, 1, 2, false, 0, 0, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868709', 1, 0, 0, 1, 0, '2008-09-23 17:29:03.448797', NULL, NULL, NULL, 'PPA for No Privileges Person', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (12, 17, 'Partner archive', true, NULL, 1, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869209', 1, 0, 1, 0, 0, '2008-09-23 17:29:03.449157', NULL, NULL, NULL, 'Partner Archive for Ubuntu Linux', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (13, 17, 'Partner archive', true, NULL, 8, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869732', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.449471', NULL, NULL, NULL, 'Partner Archive for Ubuntu Test', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (14, 17, 'Sample copy archive', true, NULL, 8, 6, false, NULL, NULL, NULL, NULL, NULL, false, 'samplecopyarchive', false, '2008-11-19 18:15:15.869732', 0, 0, 0, 0, 0, '2008-11-18 17:29:03.449471', NULL, NULL, NULL, 'Copy archive samplecopyarchive for Ubuntu Team', 0, NULL);
++INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (15, 17, 'Debug archive', true, NULL, 1, 7, false, NULL, NULL, NULL, NULL, NULL, false, 'debug', true, '2009-04-17 10:09:10.859746', 0, 0, 0, 0, 0, '2009-04-17 10:01:03.449876', NULL, NULL, NULL, 'Ubuntu DEBUG archive', 0, NULL);
  ALTER TABLE archive ENABLE TRIGGER ALL;
@@ -1677,10 +1686,19 @@
  ALTER TABLE builder ENABLE TRIGGER ALL;
++ALTER TABLE buildpackagejob DISABLE TRIGGER ALL;
++
++INSERT INTO buildpackagejob (id, job, build) VALUES (1, 1, 8);
++INSERT INTO buildpackagejob (id, job, build) VALUES (2, 2, 11);
++
++
++ALTER TABLE buildpackagejob ENABLE TRIGGER ALL;
++
++
  ALTER TABLE buildqueue DISABLE TRIGGER ALL;
--INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (1, 8, 1, 'Dummy sampledata entry, not processing', '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', 1, false);
--INSERT INTO buildqueue (id, build, builder, logtail, created, buildstart, lastscore, manual) VALUES (2, 11, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, 10, false);
++INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (1, 1, 'Dummy sampledata entry, not processing', 1, false, 1, 1);
++INSERT INTO buildqueue (id, builder, logtail, lastscore, manual, job, job_type) VALUES (2, NULL, NULL, 10, false, 2, 1);
  ALTER TABLE buildqueue ENABLE TRIGGER ALL;
@@ -2753,6 +2771,8 @@
  ALTER TABLE job DISABLE TRIGGER ALL;
++INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (1, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 09:14:12.820778', '2005-06-15 09:20:12.820778', NULL);
++INSERT INTO job (id, requester, reason, status, progress, last_report_seen, next_report_due, attempt_count, max_retries, log, scheduled_start, lease_expires, date_created, date_started, date_finished) VALUES (2, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, '2005-06-15 10:14:12.820778', NULL, NULL);
  ALTER TABLE job ENABLE TRIGGER ALL;
@@ -4579,6 +4599,13 @@
  ALTER TABLE packageset ENABLE TRIGGER ALL;
++ALTER TABLE packagesetgroup DISABLE TRIGGER ALL;
++
++
++
++ALTER TABLE packagesetgroup ENABLE TRIGGER ALL;
++
++
  ALTER TABLE packagesetinclusion DISABLE TRIGGER ALL;
@@ -8500,6 +8527,26 @@
  ALTER TABLE signedcodeofconduct ENABLE TRIGGER ALL;
++ALTER TABLE sourcepackageformatselection DISABLE TRIGGER ALL;
++
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (1, 1, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (2, 2, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (3, 3, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (4, 4, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (5, 5, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (6, 6, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (7, 7, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (8, 8, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (9, 9, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (10, 10, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (11, 11, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (12, 12, 0);
++INSERT INTO sourcepackageformatselection (id, distroseries, format) VALUES (13, 13, 0);
++
++
++ALTER TABLE sourcepackageformatselection ENABLE TRIGGER ALL;
++
++
  ALTER TABLE sourcepackagename DISABLE TRIGGER ALL;
  INSERT INTO sourcepackagename (id, name) VALUES (1, 'mozilla-firefox');
@@ -8527,17 +8574,17 @@
  ALTER TABLE sourcepackagerelease DISABLE TRIGGER ALL;
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (14, 1, '0.9', '2004-09-27 11:57:13', 1, NULL, 1, 'Mozilla dummy Changelog......', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1), pmount', 'bacula-common (= 1.34.6-2), bacula-director-common (= 1.34.6-2), postgresql-client (>= 7.4), pmount', 'any', NULL, 1, 1, 1, 1, 1, 'Mark Shuttleworth <mark@canonical.com>', '3.6.2', '1.0', 'mozilla-firefox', 1, NULL, 'gcc-4.0, pmount', 'gcc-4.0-base, pmount');
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (15, 1, '1.0', '2004-09-27 11:57:13', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 2, 1, 9, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (16, 1, '1.0-1', '2005-03-10 16:30:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 3, 1, 10, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (17, 1, '0.99.6-1', '2005-03-14 18:00:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 2, 1, 10, 1, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (15, 1, '1.0', '2004-09-27 11:57:13', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 2, 1, 9, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (16, 1, '1.0-1', '2005-03-10 16:30:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 3, 1, 10, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (17, 1, '0.99.6-1', '2005-03-14 18:00:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 2, 1, 10, 1, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (20, 1, '0.1-1', '2005-03-24 20:59:31.439579', 1, NULL, 1, 'pmount (0.1-1) hoary; urgency=low
   * Fix description (Malone #1)
   * Fix debian (Debian #2000)
   * Fix warty (Warty Ubuntu #1)
-- -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 2, 1, 14, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (21, 1, '0.1-2', '2005-06-24 20:59:31.439579', 1, NULL, 1, 'This is a placeholder changelog for pmount 0.1-2', NULL, NULL, 'powerpc', NULL, 1, 1, 14, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++ -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 2, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (21, 1, '0.1-2', '2005-06-24 20:59:31.439579', 1, NULL, 1, 'This is a placeholder changelog for pmount 0.1-2', NULL, NULL, 'powerpc', NULL, 1, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (23, 1, '1.0.8-1ubuntu1', '2005-02-03 08:50:00', 1, NULL, 1, 'alsa-utils (1.0.8-1ubuntu1) warty; urgency=low
   * Placeholder
@@ -8547,7 +8594,7 @@
   * Placeholder
--     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'any', NULL, 2, 1, 19, 8, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'any', NULL, 2, 1, 19, 8, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (25, 1, '1.0.9a-4ubuntu1', '2005-08-01 14:10:00', 1, NULL, 1, 'alsa-utils (1.0.9a-4ubuntu1) hoary; urgency=low
   * Placeholder
@@ -8557,21 +8604,21 @@
   LP: #7, #8,
     #11
--     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 16, 19, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (26, 1, 'cr.g7-37', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 20, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
++     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 16, 19, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (26, 1, 'cr.g7-37', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 20, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (27, 1, 'b8p', '2006-02-10 11:19:00', 1, NULL, 1, 'libstdc++ (9.9-1) hoary; urgency=high
   * Placeholder
-- -- Sample Person <test@canonical.com> Tue, 10 Feb 2006 10:10:08 +0300', NULL, NULL, 'powerpc i386', NULL, 1, 16, 21, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (28, 1, '2.6.15.3', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 22, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (29, 1, '0.00', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 17, 3, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (30, 1, '1.0', '2006-09-28 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (31, 1, '1.0', '2006-09-28 18:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (32, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 23, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (33, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 24, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (34, 1, '1.0', '2007-02-15 14:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 29, 16, 25, 10, 1, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (35, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 26, 1, 1, NULL, NULL, NULL, NULL, 10, NULL, NULL, NULL);
++ -- Sample Person <test@canonical.com> Tue, 10 Feb 2006 10:10:08 +0300', NULL, NULL, 'powerpc i386', NULL, 1, 16, 21, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (28, 1, '2.6.15.3', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 22, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (29, 1, '0.00', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 17, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (30, 1, '1.0', '2006-09-28 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (31, 1, '1.0', '2006-09-28 18:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (32, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 23, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (33, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 24, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (34, 1, '1.0', '2007-02-15 14:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 29, 16, 25, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (35, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 10, NULL, NULL, NULL);
  INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (36, 243606, '1.0-1', '2007-08-09 21:25:37.832976', 1, NULL, 5, 'commercialpackage (1.0-1) breezy; urgency=low
    * Initial version
@@ -8597,7 +8644,7 @@
 F4bEPeRcnUjCFI/hjR0kxg=
  =Tjln
  ', 7, 243606, 27, 10, 1, 'Julian Edwards <launchpad@julian-edwards.com>', '3.6.2', '1.0', 'commercialpackage', 12, NULL, NULL, NULL);
--INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (37, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 26, 1, 1, NULL, NULL, NULL, NULL, 11, NULL, NULL, NULL);
++INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep) VALUES (37, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 11, NULL, NULL, NULL);
  ALTER TABLE sourcepackagerelease ENABLE TRIGGER ALL;
 === modified file 'database/schema/comments.sql'
 --- database/schema/comments.sql	2009-11-02 15:33:35 +0000
 +++ database/schema/comments.sql	2009-11-16 23:27:14 +0000
@@ -1531,14 +1531,13 @@
  COMMENT ON COLUMN Builder.active IS 'Whether to present or not the builder in the public list of builders avaialble. It is used to hide transient or defunct builders while they get fixed.';
  -- BuildQueue
--COMMENT ON TABLE BuildQueue IS 'BuildQueue: The queue of builds in progress/scheduled to run. This table is the core of the build daemon master. It lists all builds in progress or scheduled to start.';
--COMMENT ON COLUMN BuildQueue.build IS 'The build for which this queue item exists. This is how the buildd master will find all the files it needs to perform the build';
++COMMENT ON TABLE BuildQueue IS 'BuildQueue: The queue of jobs in progress/scheduled to run on the Soyuz build farm.';
  COMMENT ON COLUMN BuildQueue.builder IS 'The builder assigned to this build. Some builds will have a builder assigned to queue them up; some will be building on the specified builder already; others will not have a builder yet (NULL) and will be waiting to be assigned into a builder''s queue';
--COMMENT ON COLUMN BuildQueue.created IS 'The timestamp of the creation of this row. This is used by the buildd master scheduling algorithm to decide how soon to schedule a build to run on a given builder.';
--COMMENT ON COLUMN BuildQueue.buildstart IS 'The timestamp of the start of the build run on the given builder. If this is NULL then the build is not running yet.';
  COMMENT ON COLUMN BuildQueue.logtail IS 'The tail end of the log of the current build. This is updated regularly as the buildd master polls the buildd slaves. Once the build is complete; the full log will be lodged with the librarian and linked into the build table.';
  COMMENT ON COLUMN BuildQueue.lastscore IS 'The last score ascribed to this build record. This can be used in the UI among other places.';
  COMMENT ON COLUMN BuildQueue.manual IS 'Indicates if the current record was or not rescored manually, if so it get skipped from the auto-score procedure.';
++COMMENT ON COLUMN BuildQueue.job IS 'Foreign key to the `Job` table row with the generic job data.';
++COMMENT ON COLUMN BuildQueue.job_type IS 'Type of job (enumeration value), enables us to find/query the correct table with the data specific to this type of job.';
  -- Mirrors
 === added file 'database/schema/patch-2207-09.0.sql'
 --- database/schema/patch-2207-09.0.sql	1970-01-01 00:00:00 +0000
 +++ database/schema/patch-2207-09.0.sql	2009-11-16 23:27:14 +0000
@@ -0,0 +1,10 @@
++SET client_min_messages=ERROR;
++
++-- Per Bug #196774
++ALTER TABLE Packaging
++    DROP CONSTRAINT packaging_uniqueness,
++    ADD CONSTRAINT packaging__distroseries__sourcepackagename__key
++        UNIQUE (distroseries, sourcepackagename);
++
++INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 9, 0);
++
 === added file 'database/schema/patch-2207-11-0.sql'
 --- database/schema/patch-2207-11-0.sql	1970-01-01 00:00:00 +0000
 +++ database/schema/patch-2207-11-0.sql	2009-11-16 23:27:14 +0000
@@ -0,0 +1,87 @@
++-- Copyright 2009 Canonical Ltd.  This software is licensed under the
++-- GNU Affero General Public License version 3 (see the file LICENSE).
++
++SET client_min_messages=ERROR;
++
++-- The schema patch required for the Soyuz buildd generalisation, see
++-- https://dev.launchpad.net/Soyuz/Specs/BuilddGeneralisation for details.
++-- Bug #478919.
++
++-- Step 1
++-- The `BuildPackageJob` table captures whatever data is required for
++-- "normal" Soyuz build farm jobs that build source packages.
++
++CREATE TABLE buildpackagejob (
++  id serial PRIMARY KEY,
++  -- FK to the `Job` record with "generic" data about this source package
++  -- build job. Please note that the corresponding `BuildQueue` row will
++  -- have a FK referencing the same `Job` row.
++  job integer NOT NULL CONSTRAINT buildpackagejob__job__fk REFERENCES job,
++  -- FK to the associated `Build` record.
++  build integer NOT NULL CONSTRAINT buildpackagejob__build__fk REFERENCES build
++);
++
++-- Step 2
++-- Changes needed to the `BuildQueue` table.
++
++-- The 'job' and the 'job_type' columns will enable us to find the correct
++-- database rows that hold the generic and the specific data pertaining to
++-- the job respectively.
++ALTER TABLE ONLY buildqueue ADD COLUMN job integer;
++ALTER TABLE ONLY buildqueue ADD COLUMN job_type integer NOT NULL DEFAULT 1;
++
++-- Step 3
++-- Data migration for the existing `BuildQueue` records.
++CREATE OR REPLACE FUNCTION migrate_buildqueue_rows() RETURNS integer
++LANGUAGE plpgsql AS
++$$
++DECLARE
++    queue_row RECORD;
++    job_id integer;
++    buildpackagejob_id integer;
++    rows_migrated integer;
++BEGIN
++    rows_migrated := 0;
++    FOR queue_row IN SELECT * FROM buildqueue LOOP
++        INSERT INTO job(status, date_created, date_started) VALUES(0, queue_row.created, queue_row.buildstart);
++        -- Get the key of the `Job` row just inserted.
++        SELECT currval('job_id_seq') INTO job_id;
++        INSERT INTO buildpackagejob(job, build) VALUES(job_id, queue_row.build);
++        -- Get the key of the `BuildPackageJob` row just inserted.
++        SELECT currval('buildpackagejob_id_seq') INTO buildpackagejob_id;
++        UPDATE buildqueue SET job=job_id WHERE id=queue_row.id;
++        rows_migrated := rows_migrated + 1;
++    END LOOP;
++    RETURN rows_migrated;
++END;
++$$;
++
++-- Run the data migration function.
++SELECT * FROM migrate_buildqueue_rows();
++-- The `BuildQueue` data is migrated at this point, we can get rid of the
++-- data migration function.
++DROP FUNCTION migrate_buildqueue_rows();
++
++-- Now that the data was migrated we can make the 'job' column mandatory
++-- and define the foreign key constraint for it.
++ALTER TABLE ONLY buildqueue ALTER COLUMN job SET NOT NULL;
++ALTER TABLE ONLY buildqueue
++    ADD CONSTRAINT buildqueue__job__fk
++    FOREIGN KEY (job) REFERENCES job(id);
++
++-- Step 4
++-- Now remove the obsolete columns, constraints and indexes from `BuildQueue`.
++-- The latter will from now on refer to the `Build` record via the
++-- `Job`/`BuildPackageJob` tables (and not directly any more).
++DROP INDEX buildqueue__build__idx;
++ALTER TABLE ONLY buildqueue DROP CONSTRAINT "$1";
++ALTER TABLE ONLY buildqueue DROP COLUMN build;
++ALTER TABLE ONLY buildqueue DROP COLUMN created;
++ALTER TABLE ONLY buildqueue DROP COLUMN buildstart;
++
++-- Step 5
++-- Add indexes for the new `BuildQueue` columns.
++CREATE INDEX buildqueue__job__idx ON buildqueue(job);
++CREATE INDEX buildqueue__job_type__idx ON buildqueue(job_type);
++
++INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 11, 0);
 === modified file 'database/schema/security.cfg'
 --- database/schema/security.cfg	2009-11-06 01:16:21 +0000
 +++ database/schema/security.cfg	2009-11-16 23:27:14 +0000
@@ -271,6 +271,7 @@
  public.shippingrun                      = SELECT, INSERT, UPDATE
  public.sourcepackagepublishinghistory   = SELECT
  public.seriessourcepackagebranch        = SELECT, INSERT, UPDATE, DELETE
++public.sourcepackageformatselection     = SELECT
  public.specificationbranch              = SELECT, INSERT, UPDATE, DELETE
  public.specificationbug                 = SELECT, INSERT, DELETE
  public.specificationdependency          = SELECT, INSERT, DELETE
@@ -837,6 +838,8 @@
  public.archivearch                              = SELECT, UPDATE
  public.archivedependency                        = SELECT
  public.buildqueue                               = SELECT, INSERT, UPDATE, DELETE
++public.job                                      = SELECT, INSERT, UPDATE, DELETE
++public.buildpackagejob                          = SELECT, INSERT, UPDATE, DELETE
  public.builder                                  = SELECT, INSERT, UPDATE
  public.build                                    = SELECT, INSERT, UPDATE
  public.distribution                             = SELECT, UPDATE
@@ -928,6 +931,8 @@
  public.build                            = SELECT, INSERT, UPDATE
  public.builder                          = SELECT, INSERT, UPDATE
  public.buildqueue                       = SELECT, INSERT, UPDATE, DELETE
++public.job                              = SELECT, INSERT, UPDATE, DELETE
++public.buildpackagejob                  = SELECT, INSERT, UPDATE, DELETE
  public.component                        = SELECT, INSERT, UPDATE
  public.componentselection               = SELECT, INSERT, UPDATE
  public.country                          = SELECT, INSERT, UPDATE
@@ -987,6 +992,7 @@
  public.sectionselection                 = SELECT, INSERT, UPDATE
  public.signedcodeofconduct              = SELECT, INSERT, UPDATE
  public.sourcepackagefilepublishing      = SELECT, INSERT, UPDATE
++public.sourcepackageformatselection     = SELECT, INSERT
  public.sourcepackagename                = SELECT, INSERT, UPDATE
  public.sourcepackagepublishinghistory   = SELECT
  public.securesourcepackagepublishinghistory = SELECT, INSERT, UPDATE
@@ -1103,6 +1109,7 @@
  public.archivepermission                = SELECT
  public.processor                        = SELECT
  public.processorfamily                  = SELECT
++public.sourcepackageformatselection     = SELECT
  # Source and Binary packages and builds
  public.sourcepackagename                = SELECT, INSERT
@@ -1114,6 +1121,8 @@
  public.pocketchroot                     = SELECT
  public.build                            = SELECT, INSERT, UPDATE
  public.buildqueue                       = SELECT, INSERT, UPDATE
++public.job                              = SELECT, INSERT, UPDATE
++public.buildpackagejob                  = SELECT, INSERT, UPDATE
  # Thusly the librarian
  public.libraryfilecontent               = SELECT, INSERT
@@ -1195,6 +1204,8 @@
  public.distrocomponentuploader          = SELECT
  public.build                            = SELECT, INSERT, UPDATE
  public.buildqueue                       = SELECT, INSERT, UPDATE
++public.job                              = SELECT, INSERT, UPDATE
++public.buildpackagejob                  = SELECT, INSERT, UPDATE
  public.pocketchroot                     = SELECT
  public.sourcepackagerelease             = SELECT, UPDATE
  public.binarypackagerelease             = SELECT, UPDATE
 === modified file 'lib/canonical/launchpad/helpers.py'
 --- lib/canonical/launchpad/helpers.py	2009-07-17 00:26:05 +0000
 +++ lib/canonical/launchpad/helpers.py	2009-11-16 23:27:14 +0000
@@ -477,9 +477,9 @@
      if fname.endswith(".diff.gz"):
          return SourcePackageFileType.DIFF
      if fname.endswith(".orig.tar.gz"):
--        return SourcePackageFileType.ORIG
++        return SourcePackageFileType.ORIG_TARBALL
      if fname.endswith(".tar.gz"):
--        return SourcePackageFileType.TARBALL
++        return SourcePackageFileType.NATIVE_TARBALL
  BINARYPACKAGE_EXTENSIONS = {
 === modified file 'lib/lp/archivepublisher/tests/deathrow.txt'
 --- lib/lp/archivepublisher/tests/deathrow.txt	2009-08-28 07:34:44 +0000
 +++ lib/lp/archivepublisher/tests/deathrow.txt	2009-11-16 23:27:14 +0000
@@ -106,7 +106,7 @@
  They all share a source file.
      >>> shared_file = test_publisher.addMockFile(
--    ...     'shared.tar.gz', filecontent='Y')
++    ...     'shared_1.0.tar.gz', filecontent='Y')
      >>> discard = removed_source.sourcepackagerelease.addFile(shared_file)
      >>> discard = postponed_source.sourcepackagerelease.addFile(shared_file)
      >>> discard = published_source.sourcepackagerelease.addFile(shared_file)
@@ -228,7 +228,7 @@
      obsolete-bin_666_i386.deb:   OK
      obsolete_666.dsc:            OK
      stuck-bin_666_i386.deb:      OK
--    shared.tar.gz:               OK
++    shared_1.0.tar.gz:           OK
      stuck_666.dsc:               OK
      stuck_667.dsc:               OK
      stuck_668.dsc:               OK
@@ -265,9 +265,9 @@
     used with different names for two distinct sourcepackages
     (openoffice and openoffice-l10n is an example);
-- * The source file shared across publications ('shared.tar.gz') wasn't
--   removed as it is still related to a 'live' and a 'future-deletion'
--   publications.
++ * The source file shared across publications ('shared_1.0.tar.gz')
++   wasn't removed as it is still related to a 'live' and a
++   'future-deletion' publications.
   * Dependent binaries are only possible via publication copies and are
     only removed 'atomically', i.e. since there is a 'live' publication
@@ -316,7 +316,7 @@
      obsolete-bin_666_i386.deb:   REMOVED
      obsolete_666.dsc:            REMOVED
      stuck-bin_666_i386.deb:      OK
--    shared.tar.gz:               OK
++    shared_1.0.tar.gz:           OK
      stuck_666.dsc:               REMOVED
      stuck_667.dsc:               OK
      stuck_668.dsc:               OK
@@ -389,7 +389,7 @@
      obsolete-bin_666_i386.deb:   REMOVED
      obsolete_666.dsc:            REMOVED
      stuck-bin_666_i386.deb:      REMOVED
--    shared.tar.gz:               OK
++    shared_1.0.tar.gz:           OK
      stuck_666.dsc:               REMOVED
      stuck_667.dsc:               OK
      stuck_668.dsc:               OK
 === modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
 --- lib/lp/archivepublisher/tests/test_publisher.py	2009-08-28 07:34:44 +0000
 +++ lib/lp/archivepublisher/tests/test_publisher.py	2009-11-16 23:27:14 +0000
@@ -280,7 +280,7 @@
              owner=ubuntu_team, purpose=ArchivePurpose.PPA)
          pub_source = self.getPubSource(
--            sourcename="foo", filename="foo.dsc", filecontent='Hello world',
++            sourcename="foo", filename="foo_1.dsc", filecontent='Hello world',
              status=PackagePublishingStatus.PENDING, archive=test_archive)
          publisher.A_publish(False)
@@ -290,7 +290,7 @@
          self.assertEqual(pub_source.status, PackagePublishingStatus.PENDING)
          # nothing got published
--        foo_path = "%s/main/f/foo/foo.dsc" % self.pool_dir
++        foo_path = "%s/main/f/foo/foo_1.dsc" % self.pool_dir
          self.assertEqual(os.path.exists(foo_path), False)
      def testPublishingWorksForOtherArchives(self):
@@ -309,7 +309,7 @@
              test_archive)
          pub_source = self.getPubSource(
--            sourcename="foo", filename="foo.dsc",
++            sourcename="foo", filename="foo_1.dsc",
              filecontent='I am supposed to be a embargoed archive',
              status=PackagePublishingStatus.PENDING, archive=test_archive)
@@ -322,7 +322,7 @@
          self.assertEqual(pub_source.status, PackagePublishingStatus.PUBLISHED)
          # nothing got published
--        foo_path = "%s/main/f/foo/foo.dsc" % test_pool_dir
++        foo_path = "%s/main/f/foo/foo_1.dsc" % test_pool_dir
          self.assertEqual(
              open(foo_path).read().strip(),
              'I am supposed to be a embargoed archive',)
@@ -401,11 +401,11 @@
              owner=name16, distribution=ubuntu, purpose=ArchivePurpose.PPA)
          pub_source = self.getPubSource(
--            sourcename="foo", filename="foo.dsc", filecontent='Hello world',
++            sourcename="foo", filename="foo_1.dsc", filecontent='Hello world',
              status=PackagePublishingStatus.PENDING, archive=spiv.archive)
          pub_source = self.getPubSource(
--            sourcename="foo", filename="foo.dsc", filecontent='Hello world',
++            sourcename="foo", filename="foo_1.dsc", filecontent='Hello world',
              status=PackagePublishingStatus.PUBLISHED, archive=name16.archive)
          self.assertEqual(4, ubuntu.getAllPPAs().count())
@@ -465,7 +465,7 @@
          # Pending source and binary publications.
          # The binary description explores index formatting properties.
          pub_source = self.getPubSource(
--            sourcename="foo", filename="foo.dsc", filecontent='Hello world',
++            sourcename="foo", filename="foo_1.dsc", filecontent='Hello world',
              status=PackagePublishingStatus.PENDING, archive=cprov.archive)
          pub_bin = self.getPubBinaries(
              pub_source=pub_source,
@@ -507,7 +507,7 @@
               'Format: 1.0',
               'Directory: pool/main/f/foo',
               'Files:',
--             ' 3e25960a79dbc69b674cd4ec67a72c62 11 foo.dsc',
++             ' 3e25960a79dbc69b674cd4ec67a72c62 11 foo_1.dsc',
               ''],
              index_contents)
 === modified file 'lib/lp/archiveuploader/dscfile.py'
 --- lib/lp/archiveuploader/dscfile.py	2009-06-24 23:33:29 +0000
 +++ lib/lp/archiveuploader/dscfile.py	2009-11-16 23:27:14 +0000
@@ -31,10 +31,13 @@
      parse_tagfile, TagFileParseError)
  from lp.archiveuploader.utils import (
      prefix_multi_line_string, safe_fix_maintainer, ParseMaintError,
--    re_valid_pkg_name, re_valid_version, re_issource)
++    re_valid_pkg_name, re_valid_version, re_issource,
++    determine_source_file_type)
  from canonical.encoding import guess as guess_encoding
  from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
--from lp.soyuz.interfaces.archive import ArchivePurpose
++from lp.registry.interfaces.sourcepackage import SourcePackageFileType
++from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
++from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
  from canonical.launchpad.interfaces import (
      GPGVerificationError, IGPGHandler, IGPGKeySet,
      ISourcePackageNameSet, NotFoundError)
@@ -228,6 +231,9 @@
          This method is an error generator, i.e, it returns an iterator over all
          exceptions that are generated while processing DSC file checks.
          """
++        # Avoid circular imports.
++        from lp.archiveuploader.nascentupload import EarlyReturnUploadError
++
          for error in SourceUploadFile.verify(self):
              yield error
@@ -265,10 +271,17 @@
              yield UploadError(
                  "%s: invalid version %s" % (self.filename, self.dsc_version))
--        if self.format != "1.0":
++        try:
++            format_term = SourcePackageFormat.getTermByToken(self.format)
++        except LookupError:
++            raise EarlyReturnUploadError(
++                "Unsupported source format: %s" % self.format)
++
++        if not self.policy.distroseries.isSourcePackageFormatPermitted(
++            format_term.value):
              yield UploadError(
--                "%s: Format is not 1.0. This is incompatible with "
--                "dpkg-source." % self.filename)
++                "%s: format '%s' is not permitted in %s." %
++                (self.filename, self.format, self.policy.distroseries.name))
          # Validate the build dependencies
          for field_name in ['build-depends', 'build-depends-indep']:
@@ -323,8 +336,19 @@
          :raise: `NotFoundError` when the wanted file could not be found.
          """
--        if (self.policy.archive.purpose == ArchivePurpose.PPA and
--            filename.endswith('.orig.tar.gz')):
++        # We cannot check the archive purpose for partner archives here,
++        # because the archive override rules have not been applied yet.
++        # Uploads destined for the Ubuntu main archive and the 'partner'
++        # component will eventually end up in the partner archive though.
++        if (self.policy.archive.purpose == ArchivePurpose.PRIMARY and
++            self.component_name == 'partner'):
++            archives = [
++                getUtility(IArchiveSet).getByDistroPurpose(
++                distribution=self.policy.distro,
++                purpose=ArchivePurpose.PARTNER)]
++        elif (self.policy.archive.purpose == ArchivePurpose.PPA and
++            determine_source_file_type(filename) ==
++                SourcePackageFileType.ORIG_TARBALL):
              archives = [self.policy.archive, self.policy.distro.main_archive]
          else:
              archives = [self.policy.archive]
@@ -348,11 +372,25 @@
          We don't use the NascentUploadFile.verify here, only verify size
          and checksum.
          """
--        has_tar = False
++
++        diff_count = 0
++        orig_tar_count = 0
++        native_tar_count = 0
++
          files_missing = False
          for sub_dsc_file in self.files:
--            if sub_dsc_file.filename.endswith("tar.gz"):
--                has_tar = True
++            filetype = determine_source_file_type(sub_dsc_file.filename)
++
++            if filetype == SourcePackageFileType.DIFF:
++                diff_count += 1
++            elif filetype == SourcePackageFileType.ORIG_TARBALL:
++                orig_tar_count += 1
++            elif filetype == SourcePackageFileType.NATIVE_TARBALL:
++                native_tar_count += 1
++            else:
++                yield UploadError('Unknown file: ' + sub_dsc_file.filename)
++                continue
++
              try:
                  library_file, file_archive = self._getFileByName(
                      sub_dsc_file.filename)
@@ -397,11 +435,37 @@
                  yield error
                  files_missing = True
--
--        if not has_tar:
--            yield UploadError(
--                "%s: does not mention any tar.gz or orig.tar.gz."
--                % self.filename)
++        # Reject if we have more than one file of any type.
++        if orig_tar_count > 1:
++            yield UploadError(
++                "%s: has more than one orig.tar.*."
++                % self.filename)
++        if native_tar_count > 1:
++            yield UploadError(
++                "%s: has more than one tar.*."
++                % self.filename)
++        if diff_count > 1:
++            yield UploadError(
++                "%s: has more than one diff.gz."
++                % self.filename)
++
++        if ((orig_tar_count == 0 and native_tar_count == 0) or
++            (orig_tar_count > 0 and native_tar_count > 0)):
++            yield UploadError(
++                "%s: must have exactly one tar.* or orig.tar.*."
++                % self.filename)
++
++        # Format 1.0 must be native (exactly one tar.gz), or
++        # have an orig.tar.gz and a diff.gz. It cannot have
++        # compression types other than 'gz'.
++        if self.format == '1.0':
++            if ((diff_count == 0 and native_tar_count == 0) or
++                (diff_count > 0 and native_tar_count > 0)):
++                yield UploadError(
++                    "%s: must have exactly one diff.gz or tar.gz."
++                    % self.filename)
++        else:
++            raise AssertionError("Unknown source format.")
          if files_missing:
              yield UploadError(
 === modified file 'lib/lp/archiveuploader/nascentupload.py'
 --- lib/lp/archiveuploader/nascentupload.py	2009-11-09 17:54:02 +0000
 +++ lib/lp/archiveuploader/nascentupload.py	2009-11-16 23:27:14 +0000
@@ -28,8 +28,10 @@
  from lp.archiveuploader.nascentuploadfile import (
      UploadError, UploadWarning, CustomUploadFile, SourceUploadFile,
      BaseBinaryUploadFile)
++from lp.archiveuploader.utils import determine_source_file_type
  from lp.archiveuploader.permission import verify_upload
  from lp.registry.interfaces.pocket import PackagePublishingPocket
++from lp.registry.interfaces.sourcepackage import SourcePackageFileType
  from lp.soyuz.interfaces.archive import ArchivePurpose, MAIN_ARCHIVE_PURPOSES
  from canonical.launchpad.interfaces import (
      IBinaryPackageNameSet, IDistributionSet, ILibraryFileAliasSet,
@@ -302,53 +304,35 @@
          """Heuristic checks on a sourceful upload.
          Raises AssertionError when called for a non-sourceful upload.
--        Ensures a sourceful upload has, at least:
--
--         * One DSC
--         * One or none DIFF
--         * One or none ORIG
--         * One or none TAR
--         * If no DIFF is present it must have a TAR (native)
--
--        'hasorig' and 'native' attributes are set when an ORIG and/or an
--        TAR file, respectively, are present.
++        Ensures a sourceful upload has exactly one DSC.
          """
          assert self.sourceful, (
              "Source consistency check called for a non-source upload")
          dsc = 0
--        diff = 0
--        orig = 0
--        tar = 0
++        native_tarball = 0
++        orig_tarball = 0
          for uploaded_file in self.changes.files:
--            if uploaded_file.filename.endswith(".dsc"):
++            filetype = determine_source_file_type(uploaded_file.filename)
++            if filetype == SourcePackageFileType.DSC:
                  dsc += 1
--            elif uploaded_file.filename.endswith(".diff.gz"):
--                diff += 1
--            elif uploaded_file.filename.endswith(".orig.tar.gz"):
--                orig += 1
--            elif (uploaded_file.filename.endswith(".tar.gz")
++            elif (filetype == SourcePackageFileType.NATIVE_TARBALL
                    and not isinstance(uploaded_file, CustomUploadFile)):
--                tar += 1
--
--        # Okay, let's check the sanity of the upload.
++                native_tarball += 1
++            elif filetype == SourcePackageFileType.ORIG_TARBALL:
++                orig_tarball += 1
++
++
++        # It is never sane to upload more than one source at a time.
          if dsc > 1:
              self.reject("Changes file lists more than one .dsc")
--        if diff > 1:
--            self.reject("Changes file lists more than one .diff.gz")
--        if orig > 1:
--            self.reject("Changes file lists more than one orig.tar.gz")
--        if tar > 1:
--            self.reject("Changes file lists more than one native tar.gz")
          if dsc == 0:
              self.reject("Sourceful upload without a .dsc")
--        if diff == 0 and tar == 0:
--            self.reject("Sourceful upload without a diff or native tar")
--        self.native = bool(tar)
--        self.hasorig = bool(orig)
++        self.native = bool(native_tarball)
++        self.hasorig = bool(orig_tarball)
      def _check_binaryful_consistency(self):
          """Heuristic checks on a binaryful upload.
 === modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
 --- lib/lp/archiveuploader/nascentuploadfile.py	2009-07-17 00:26:05 +0000
 +++ lib/lp/archiveuploader/nascentuploadfile.py	2009-11-16 23:27:14 +0000
@@ -33,8 +33,9 @@
  from lp.archiveuploader.utils import (
      prefix_multi_line_string, re_taint_free, re_isadeb, re_issource,
      re_no_epoch, re_no_revision, re_valid_version, re_valid_pkg_name,
--    re_extract_src_version)
++    re_extract_src_version, determine_source_file_type)
  from canonical.encoding import guess as guess_encoding
++from lp.registry.interfaces.sourcepackage import SourcePackageFileType
  from lp.soyuz.interfaces.binarypackagename import (
      IBinaryPackageNameSet)
  from lp.soyuz.interfaces.binarypackagerelease import (
@@ -351,7 +352,8 @@
                  "Architecture field." % (self.filename))
          version_chopped = re_no_epoch.sub('', self.version)
--        if self.filename.endswith("orig.tar.gz"):
++        if determine_source_file_type(self.filename) == (
++            SourcePackageFileType.ORIG_TARBALL):
              version_chopped = re_no_revision.sub('', version_chopped)
          source_match = re_issource.match(self.filename)
 === added directory 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt'
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.debian.tar.gz'
 Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.debian.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.debian.tar.gz	2009-11-16 23:27:14 +0000 differ
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc'
 --- lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc	1970-01-01 00:00:00 +0000
 +++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc	2009-11-16 23:27:14 +0000
@@ -0,0 +1,16 @@
++Format: 3.0 (quilt)
++Source: bar
++Binary: bar
++Architecture: any
++Version: 1.0-1
++Maintainer: Launchpad team <launchpad@lists.canonical.com>
++Standards-Version: 3.6.2
++Checksums-Sha1:
++ 73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
++ abce262314a7c0ca00e43598f21b41a3e6ff6b21 688 bar_1.0-1.debian.tar.gz
++Checksums-Sha256:
++ f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
++ ffdcce60fca14618f68483ca77a206f332a3773dc7ece1c3e6de55c0118c69c6 688 bar_1.0-1.debian.tar.gz
++Files:
++ fc1464e5985b962a042d5354452f361d 164 bar_1.0.orig.tar.gz
++ 056db4dfe7de8322296b6d417592ee01 688 bar_1.0-1.debian.tar.gz
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes'
 --- lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes	1970-01-01 00:00:00 +0000
 +++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes	2009-11-16 23:27:14 +0000
@@ -0,0 +1,28 @@
++Format: 1.8
++Date: Thu, 16 Feb 2006 15:34:09 +0000
++Source: bar
++Binary: bar
++Architecture: source
++Version: 1.0-1
++Distribution: breezy
++Urgency: low
++Maintainer: Launchpad team <launchpad@lists.canonical.com>
++Changed-By: Daniel Silverstone <daniel.silverstone@canonical.com>
++Description:
++ bar        - Stuff for testing
++Changes:
++ bar (1.0-1) breezy; urgency=low
++ .
++   * Initial version
++Checksums-Sha1:
++ bc97e185cf31af33bf8d109044ce51f32d09c229 645 bar_1.0-1.dsc
++ 73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
++ abce262314a7c0ca00e43598f21b41a3e6ff6b21 688 bar_1.0-1.debian.tar.gz
++Checksums-Sha256:
++ ae0fb16941a95518332a8ee962d00d55963b491c2df94b3f230a65d2bdbeedf8 645 bar_1.0-1.dsc
++ f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
++ ffdcce60fca14618f68483ca77a206f332a3773dc7ece1c3e6de55c0118c69c6 688 bar_1.0-1.debian.tar.gz
++Files:
++ c320d2827f08f09ec2e1bbbac635225c 645 devel optional bar_1.0-1.dsc
++ fc1464e5985b962a042d5354452f361d 164 devel optional bar_1.0.orig.tar.gz
++ 056db4dfe7de8322296b6d417592ee01 688 devel optional bar_1.0-1.debian.tar.gz
 === added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz'
 Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz	2009-11-16 23:27:14 +0000 differ
 === added directory 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3'
 === added file 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.diff.gz'
 Binary files lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.diff.gz	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.diff.gz	2009-11-16 23:27:14 +0000 differ
 === added file 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.dsc'
 --- lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.dsc	1970-01-01 00:00:00 +0000
 +++ lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.dsc	2009-11-16 23:27:14 +0000
@@ -0,0 +1,10 @@
++Format: 1.0
++Source: foocomm
++Version: 1.0-3
++Binary: foocomm
++Maintainer: Launchpad team <launchpad@lists.canonical.com>
++Architecture: any
++Standards-Version: 3.6.2
++Files:
++ ad436f97a58df5b233209857439f1e7c 171 foocomm_1.0.orig.tar.gz
++ e03c530973064ebbbde9226e03868cb1 595 foocomm_1.0-3.diff.gz
 === added file 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3_source.changes'
 --- lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3_source.changes	1970-01-01 00:00:00 +0000
 +++ lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3_source.changes	2009-11-16 23:27:14 +0000
@@ -0,0 +1,27 @@
++Format: 1.7
++Date: Thu, 27 Feb 2006 15:34:09 +0000
++Source: foocomm
++Binary: foocomm
++Architecture: source
++Version: 1.0-3
++Distribution: breezy
++Urgency: low
++Maintainer: Launchpad team <launchpad@lists.canonical.com>
++Changed-By: Foo Bar <foo.bar@canonical.com>
++Description:
++ foocomm        - Stuff for testing
++Changes:
++ foocomm (1.0-1) breezy; urgency=low
++ .
++   * Initial version
++ .
++ foocomm (1.0-2) breezy; urgency=low
++ .
++   * Version 2 testing
++ .
++ foocomm (1.0-3) breezy; urgency=low
++ .
++   * Version 3 testing, orig.tar.gz reuse from partner archive.
++Files:
++ 5885c292c1f4a3611a6506e4fa4e80a8 291 partner/devel optional foocomm_1.0-3.dsc
++ e03c530973064ebbbde9226e03868cb1 595 partner/devel optional foocomm_1.0-3.diff.gz
 === modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
 --- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2009-10-26 18:40:04 +0000
 +++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2009-11-16 23:27:14 +0000
@@ -946,6 +946,7 @@
          except NotFoundError:
              self.fail('bar_1.0.orig.tar.gz is not yet published.')
++        # Please note: this upload goes to the Ubuntu main archive.
          upload_dir = self.queueUpload("bar_1.0-10")
          self.processUpload(self.uploadprocessor, upload_dir)
          # Discard the announcement email and check the acceptance message
@@ -961,6 +962,7 @@
          # Make the official bar orig.tar.gz available in the system.
          self.uploadNewBarToUbuntu()
++        # Please note: the upload goes to the PPA.
          # Upload a higher version of 'bar' to a PPA that relies on the
          # availability of orig.tar.gz published in ubuntu.
          upload_dir = self.queueUpload("bar_1.0-10", "~name16/ubuntu")
@@ -1032,6 +1034,7 @@
          # Make the official bar orig.tar.gz available in the system.
          self.uploadNewBarToUbuntu()
++        # Please note: the upload goes to the PPA.
          # Upload a higher version of 'bar' to a PPA that relies on the
          # availability of orig.tar.gz published in the PPA itself.
          upload_dir = self.queueUpload("bar_1.0-10-ppa-orig", "~name16/ubuntu")
 === modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
 --- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-09 16:44:39 +0000
 +++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-16 23:27:14 +0000
@@ -49,6 +49,8 @@
  from lp.soyuz.interfaces.archivepermission import (
      ArchivePermissionType, IArchivePermissionSet)
  from lp.soyuz.interfaces.component import IComponentSet
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelectionSet, SourcePackageFormat)
  from lp.registry.interfaces.person import IPersonSet
  from lp.registry.interfaces.sourcepackagename import (
      ISourcePackageNameSet)
@@ -157,7 +159,7 @@
                  excName = str(excClass)
              raise self.failureException, "%s not raised" % excName
--    def setupBreezy(self, name="breezy"):
++    def setupBreezy(self, name="breezy", permitted_formats=None):
          """Create a fresh distroseries in ubuntu.
          Use *initialiseFromParent* procedure to create 'breezy'
@@ -168,6 +170,8 @@
          :param name: supply the name of the distroseries if you don't want
              it to be called "breezy"
++        :param permitted_formats: list of SourcePackageFormats to allow
++            in the new distroseries. Only permits '1.0' by default.
          """
          self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
          bat = self.ubuntu['breezy-autotest']
@@ -185,6 +189,14 @@
          self.breezy.changeslist = 'breezy-changes@ubuntu.com'
          self.breezy.initialiseFromParent()
++        if permitted_formats is None:
++            permitted_formats = [SourcePackageFormat.FORMAT_1_0]
++
++        for format in permitted_formats:
++            if not self.breezy.isSourcePackageFormatPermitted(format):
++                getUtility(ISourcePackageFormatSelectionSet).add(
++                    self.breezy, format)
++
      def addMockFile(self, filename, content="anything"):
          """Return a librarian file."""
          return getUtility(ILibraryFileAliasSet).create(
@@ -742,6 +754,53 @@
              "Expected email containing 'Cannot mix partner files with "
              "non-partner.', got:\n%s" % raw_msg)
++    def testPartnerReusingOrigFromPartner(self):
++        """Partner uploads reuse 'orig.tar.gz' from the partner archive."""
++        # Make the official bar orig.tar.gz available in the system.
++        uploadprocessor = self.setupBreezyAndGetUploadProcessor(
++            policy='absolutely-anything')
++
++        upload_dir = self.queueUpload("foocomm_1.0-1")
++        self.processUpload(uploadprocessor, upload_dir)
++
++        self.assertEqual(
++            uploadprocessor.last_processed_upload.queue_root.status,
++            PackageUploadStatus.NEW)
++
++        [queue_item] = self.breezy.getQueueItems(
++            status=PackageUploadStatus.NEW, name="foocomm",
++            version="1.0-1", exact_match=True)
++        queue_item.setAccepted()
++        queue_item.realiseUpload()
++        self.layer.commit()
++
++        archive = getUtility(IArchiveSet).getByDistroPurpose(
++            distribution=self.ubuntu, purpose=ArchivePurpose.PARTNER)
++        try:
++            self.ubuntu.getFileByName(
++                'foocomm_1.0.orig.tar.gz', archive=archive, source=True,
++                binary=False)
++        except NotFoundError:
++            self.fail('foocomm_1.0.orig.tar.gz is not yet published.')
++
++        # Please note: this upload goes to the Ubuntu main archive.
++        upload_dir = self.queueUpload("foocomm_1.0-3")
++        self.processUpload(uploadprocessor, upload_dir)
++        # Discard the announcement email and check the acceptance message
++        # content.
++        from_addr, to_addrs, raw_msg = stub.test_emails.pop()
++        msg = message_from_string(raw_msg)
++        # This is now a MIMEMultipart message.
++        body = msg.get_payload(0)
++        body = body.get_payload(decode=True)
++
++        self.assertEqual(
++            '[ubuntu/breezy] foocomm 1.0-3 (Accepted)', msg['Subject'])
++        self.assertFalse(
++            'Unable to find foocomm_1.0.orig.tar.gz in upload or '
++            'distribution.' in body,
++            'Unable to find foocomm_1.0.orig.tar.gz')
++
      def testPartnerUpload(self):
          """Partner packages should be uploaded to the partner archive.
@@ -1420,6 +1479,28 @@
+             ]
          self.assertEmail(contents, recipients=recipients)
++    def test30QuiltUploadToUnsupportingSeriesIsRejected(self):
++        """Ensure that uploads to series without format support are rejected.
++
++        Series can restrict the source formats that they accept. Uploads
++        should be rejected if an unsupported format is uploaded.
++        """
++        self.setupBreezy()
++        self.layer.txn.commit()
++        self.options.context = 'absolutely-anything'
++        uploadprocessor = UploadProcessor(
++            self.options, self.layer.txn, self.log)
++
++        # Upload the source.
++        upload_dir = self.queueUpload("bar_1.0-1_3.0-quilt")
++        self.processUpload(uploadprocessor, upload_dir)
++        # Make sure it was rejected.
++        from_addr, to_addrs, raw_msg = stub.test_emails.pop()
++        self.assertTrue(
++            "bar_1.0-1.dsc: format '3.0 (quilt)' is not permitted in "
++            "breezy." in raw_msg,
++            "Source was not rejected properly:\n%s" % raw_msg)
++
  def test_suite():
      return unittest.TestLoader().loadTestsFromName(__name__)
 === modified file 'lib/lp/archiveuploader/tests/test_utils.py'
 --- lib/lp/archiveuploader/tests/test_utils.py	2009-06-24 23:33:29 +0000
 +++ lib/lp/archiveuploader/tests/test_utils.py	2009-11-16 23:27:14 +0000
@@ -8,6 +8,8 @@
  import unittest
  import sys
  import shutil
++
++from lp.registry.interfaces.sourcepackage import SourcePackageFileType
  from lp.archiveuploader.tests import datadir
@@ -17,6 +19,25 @@
          """lp.archiveuploader.utils should be importable"""
          import lp.archiveuploader.utils
++    def test_determine_source_file_type(self):
++        """lp.archiveuploader.utils.determine_source_file_type should work."""
++        from lp.archiveuploader.utils import determine_source_file_type
++
++        self.assertEquals(
++            SourcePackageFileType.DSC,
++            determine_source_file_type('foo_1.0-1.dsc'))
++        self.assertEquals(
++            SourcePackageFileType.DIFF,
++            determine_source_file_type('foo_1.0-1.diff.gz'))
++        self.assertEquals(
++            SourcePackageFileType.ORIG_TARBALL,
++            determine_source_file_type('foo_1.0.orig.tar.gz'))
++        self.assertEquals(
++            SourcePackageFileType.NATIVE_TARBALL,
++            determine_source_file_type('foo_1.0.tar.gz'))
++        self.assertEquals(None, determine_source_file_type('foo_1.0'))
++        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
++
      def testPrefixMultilineString(self):
          """lp.archiveuploader.utils.prefix_multi_line_string should work"""
          from lp.archiveuploader.utils import prefix_multi_line_string
 === modified file 'lib/lp/archiveuploader/utils.py'
 --- lib/lp/archiveuploader/utils.py	2009-06-24 23:33:29 +0000
 +++ lib/lp/archiveuploader/utils.py	2009-11-16 23:27:14 +0000
@@ -15,6 +15,8 @@
      're_valid_pkg_name',
      're_changes_file_name',
      're_extract_src_version',
++    'get_source_file_extension',
++    'determine_source_file_type',
      'prefix_multi_line_string',
      'safe_fix_maintainer',
      'ParseMaintError',
@@ -31,7 +33,14 @@
  re_taint_free = re.compile(r"^[-+~/\.\w]+$")
  re_isadeb = re.compile(r"(.+?)_(.+?)_(.+)\.(u?d?deb)$")
--re_issource = re.compile(r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)$")
++
++source_file_exts = ['orig.tar.gz', 'diff.gz', 'tar.gz', 'dsc']
++re_issource = re.compile(
++    r"(.+)_(.+?)\.(%s)" % "|".join(
++        re.escape(ext) for ext in source_file_exts))
++
++re_is_orig_tar_ext = re.compile(r"^orig.tar.gz$")
++re_is_native_tar_ext = re.compile(r"^tar.gz$")
  re_no_epoch = re.compile(r"^\d+\:")
  re_no_revision = re.compile(r"-[^-]+$")
@@ -44,6 +53,34 @@
  re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>")
++def get_source_file_extension(filename):
++    """Get the extension part of a source file name."""
++    match = re_issource.match(filename)
++    if match is None:
++        return None
++    return match.group(3)
++
++
++def determine_source_file_type(filename):
++    """Determine the SourcePackageFileType of the given filename."""
++    # Avoid circular imports.
++    from lp.registry.interfaces.sourcepackage import SourcePackageFileType
++
++    extension = get_source_file_extension(filename)
++    if extension is None:
++        return None
++    elif extension == "dsc":
++        return SourcePackageFileType.DSC
++    elif extension == "diff.gz":
++        return SourcePackageFileType.DIFF
++    elif re_is_orig_tar_ext.match(extension):
++        return SourcePackageFileType.ORIG_TARBALL
++    elif re_is_native_tar_ext.match(extension):
++        return SourcePackageFileType.NATIVE_TARBALL
++    else:
++        return None
++
++
  def prefix_multi_line_string(str, prefix, include_blank_lines=0):
      """Utility function to split an input string and prefix,
 === modified file 'lib/lp/buildmaster/buildergroup.py'
 --- lib/lp/buildmaster/buildergroup.py	2009-08-16 12:38:12 +0000
 +++ lib/lp/buildmaster/buildergroup.py	2009-11-16 23:27:14 +0000
@@ -130,8 +130,9 @@
          try:
              build = getUtility(IBuildSet).getByBuildID(int(build_id))
              queue_item = getUtility(IBuildQueueSet).get(int(queue_item_id))
--            # Also check it build and buildqueue are properly related.
--            if queue_item.build.id != build.id:
++            queued_build = getUtility(IBuildSet).getByQueueEntry(queue_item)
++            # Also check whether build and buildqueue are properly related.
++            if queued_build.id != build.id:
                  raise BuildJobMismatch('Job build entry mismatch')
          except (SQLObjectNotFound, NotFoundError, BuildJobMismatch), reason:
@@ -159,9 +160,10 @@
          Invoke getFileFromSlave method with 'buildlog' identifier.
          """
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
          return queueItem.builder.transferSlaveFileToLibrarian(
              'buildlog', queueItem.getLogFileName(),
--            queueItem.build.archive.private)
++            build.archive.private)
      def updateBuild(self, queueItem):
          """Verify the current build job status.
@@ -199,7 +201,7 @@
                  "Unknown status code (%s) returned from status() probe."
                  % builder_status)
              queueItem.builder = None
--            queueItem.buildstart = None
++            queueItem.setDateStarted(None)
              self.commit()
              return
@@ -261,17 +263,18 @@
          Store Buildlog, datebuilt, duration, dependencies.
          """
--        queueItem.build.buildlog = self.getLogFromSlave(queueItem)
--        queueItem.build.builder = queueItem.builder
--        queueItem.build.dependencies = dependencies
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        build.buildlog = self.getLogFromSlave(queueItem)
++        build.builder = queueItem.builder
++        build.dependencies = dependencies
          # XXX cprov 20060615 bug=120584: Currently buildduration includes
          # the scanner latency, it should really be asking the slave for
          # the duration spent building locally.
--        queueItem.build.datebuilt = UTC_NOW
++        build.datebuilt = UTC_NOW
          # We need dynamic datetime.now() instance to be able to perform
          # the time operations for duration.
          RIGHT_NOW = datetime.datetime.now(pytz.timezone('UTC'))
--        queueItem.build.buildduration = RIGHT_NOW - queueItem.buildstart
++        build.buildduration = RIGHT_NOW - queueItem.date_started
      def buildStatus_OK(self, queueItem, librarian, buildid,
@@ -287,7 +290,7 @@
          self.logger.debug("Processing successful build %s" % buildid)
          # Explode before collect a binary that is denied in this
          # distroseries/pocket
--        build = queueItem.build
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
          if not build.archive.allowUpdatesToReleasePocket():
              assert build.distroseries.canUploadToPocket(build.pocket), (
                  "%s (%s) can not be built for pocket %s: illegal status"
@@ -309,8 +312,9 @@
          # can be correctly found during the upload:
          #       <archive_id>/distribution_name
          # for all destination archive types.
--        archive = queueItem.build.archive
--        distribution_name = queueItem.build.distribution.name
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        archive = build.archive
++        distribution_name = build.distribution.name
          target_path = '%s/%s' % (archive.id, distribution_name)
          upload_path = os.path.join(upload_dir, target_path)
          os.makedirs(upload_path)
@@ -330,10 +334,10 @@
          # add extra arguments for processing a binary upload
          extra_args = [
              "--log-file", "%s" %  uploader_logfilename,
--            "-d", "%s" % queueItem.build.distribution.name,
--            "-s", "%s" % (queueItem.build.distroseries.name +
--                          pocketsuffix[queueItem.build.pocket]),
--            "-b", "%s" % queueItem.build.id,
++            "-d", "%s" % build.distribution.name,
++            "-s", "%s" % (build.distroseries.name +
++                          pocketsuffix[build.pocket]),
++            "-b", "%s" % build.id,
              "-J", "%s" % upload_leaf,
              "%s" % root,
+             ]
@@ -409,12 +413,11 @@
          # uploader about this occurrence. The failure notification will
          # also contain the information required to manually reprocess the
          # binary upload when it was the case.
--        build = getUtility(IBuildSet).getByBuildID(queueItem.build.id)
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
          if (build.buildstate != BuildStatus.FULLYBUILT or
              build.binarypackages.count() == 0):
              self.logger.debug("Build %s upload failed." % build.id)
--            # update builder
--            queueItem.build.buildstate = BuildStatus.FAILEDTOUPLOAD
++            build.buildstate = BuildStatus.FAILEDTOUPLOAD
              # Retrieve log file content.
              possible_locations = (
                  'failed', 'failed-to-move', 'rejected', 'accepted')
@@ -434,11 +437,13 @@
                  uploader_log_content = 'Could not find upload log file'
              # Store the upload_log_contents in librarian so it can be
              # accessed by anyone with permission to see the build.
--            queueItem.build.storeUploadLog(uploader_log_content)
++            build.storeUploadLog(uploader_log_content)
              # Notify the build failure.
--            queueItem.build.notify(extra_info=uploader_log_content)
++            build.notify(extra_info=uploader_log_content)
          else:
--            self.logger.debug("Gathered build %s completely" % queueItem.name)
++            self.logger.debug(
++                "Gathered build %s completely" %
++                build.sourcepackagerelease.name)
          # Release the builder for another job.
          queueItem.builder.cleanSlave()
@@ -456,10 +461,11 @@
          set the job status as FAILEDTOBUILD, store available info and
          remove Buildqueue entry.
          """
--        queueItem.build.buildstate = BuildStatus.FAILEDTOBUILD
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        build.buildstate = BuildStatus.FAILEDTOBUILD
          self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
          queueItem.builder.cleanSlave()
--        queueItem.build.notify()
++        build.notify()
          queueItem.destroySelf()
      def buildStatus_DEPFAIL(self, queueItem, librarian, buildid,
@@ -470,7 +476,8 @@
          MANUALDEPWAIT, store available information, remove BuildQueue
          entry and release builder slave for another job.
          """
--        queueItem.build.buildstate = BuildStatus.MANUALDEPWAIT
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        build.buildstate = BuildStatus.MANUALDEPWAIT
          self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
          self.logger.critical("***** %s is MANUALDEPWAIT *****"
                               % queueItem.builder.name)
@@ -485,12 +492,13 @@
          job as CHROOTFAIL, store available information, remove BuildQueue
          and release the builder.
          """
--        queueItem.build.buildstate = BuildStatus.CHROOTWAIT
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        build.buildstate = BuildStatus.CHROOTWAIT
          self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
          self.logger.critical("***** %s is CHROOTWAIT *****" %
                               queueItem.builder.name)
          queueItem.builder.cleanSlave()
--        queueItem.build.notify()
++        build.notify()
          queueItem.destroySelf()
      def buildStatus_BUILDERFAIL(self, queueItem, librarian, buildid,
@@ -507,10 +515,11 @@
                           ("Builder returned BUILDERFAIL when asked "
                            "for its status"))
          # simply reset job
--        queueItem.build.buildstate = BuildStatus.NEEDSBUILD
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        build.buildstate = BuildStatus.NEEDSBUILD
          self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
          queueItem.builder = None
--        queueItem.buildstart = None
++        queueItem.setDateStarted(None)
      def buildStatus_GIVENBACK(self, queueItem, librarian, buildid,
                                filemap=None, dependencies=None):
@@ -522,7 +531,8 @@
          """
          self.logger.warning("***** %s is GIVENBACK by %s *****"
                              % (buildid, queueItem.builder.name))
--        queueItem.build.buildstate = BuildStatus.NEEDSBUILD
++        build = getUtility(IBuildSet).getByQueueEntry(queueItem)
++        build.buildstate = BuildStatus.NEEDSBUILD
          self.storeBuildInfo(queueItem, librarian, buildid, dependencies)
          # XXX cprov 2006-05-30: Currently this information is not
          # properly presented in the Web UI. We will discuss it in
@@ -530,7 +540,7 @@
          # to use this content. For now we just ensure it's stored.
          queueItem.builder.cleanSlave()
          queueItem.builder = None
--        queueItem.buildstart = None
++        queueItem.setDateStarted(None)
          queueItem.logtail = None
          queueItem.lastscore = 0
 === added directory 'lib/lp/buildmaster/interfaces'
 === added file 'lib/lp/buildmaster/interfaces/__init__.py'
 === added file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
 --- lib/lp/buildmaster/interfaces/buildfarmjob.py	1970-01-01 00:00:00 +0000
 +++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2009-11-16 23:27:14 +0000
@@ -0,0 +1,71 @@
++# Copyright 2009 Canonical Ltd.  This software is licensed under the
++# GNU Affero General Public License version 3 (see the file LICENSE).
++
++# pylint: disable-msg=E0211,E0213
++
++"""Interface for Soyuz build farm jobs."""
++
++__metaclass__ = type
++
++__all__ = [
++    'IBuildFarmJob',
++    'BuildFarmJobType',
++    ]
++
++from zope.interface import Interface
++from lazr.enum import DBEnumeratedType, DBItem
++
++
++class BuildFarmJobType(DBEnumeratedType):
++    """Soyuz build farm job type.
++
++    An enumeration with the types of jobs that may be run on the Soyuz build
++    farm.
++    """
++
++    PACKAGEBUILD = DBItem(1, """
++        PackageBuildJob
++
++        Build a source package.
++        """)
++
++    BRANCHBUILD = DBItem(2, """
++        BranchBuildJob
++
++        Build a package from a bazaar branch.
++        """)
++
++    RECIPEBRANCHBUILD = DBItem(3, """
++        RecipeBranchBuildJob
++
++        Build a package from a bazaar branch and a recipe.
++        """)
++
++    TRANSLATION = DBItem(4, """
++        TranslationJob
++
++        Perform a translation job.
++        """)
++
++
++class IBuildFarmJob(Interface):
++    """Operations that Soyuz build farm jobs must implement."""
++
++    def score():
++        """Calculate a job score appropriate for the job type in question."""
++
++    def getLogFileName():
++        """The preferred file name for the log of this Soyuz job."""
++
++    def getName():
++        """An appropriate name for this Soyuz job."""
++
++    def jobStarted():
++        """'Job started' life cycle event, handle as appropriate."""
++
++    def jobReset():
++        """'Job reset' life cycle event, handle as appropriate."""
++
++    def jobAborted():
++        """'Job aborted' life cycle event, handle as appropriate."""
++
 === modified file 'lib/lp/buildmaster/master.py'
 --- lib/lp/buildmaster/master.py	2009-10-26 18:40:04 +0000
 +++ lib/lp/buildmaster/master.py	2009-11-16 23:27:14 +0000
@@ -280,8 +280,10 @@
              "scanActiveBuilders() found %d active build(s) to check"
              % queueItems.count())
++        build_set = getUtility(IBuildSet)
          for job in queueItems:
--            proc = job.archseries.processorfamily
++            build = build_set.getByQueueEntry(job)
++            proc = build.distroarchseries.processorfamily
              try:
                  builders = notes[proc]["builders"]
              except KeyError:
@@ -309,7 +311,7 @@
                            % candidates.count())
          for job in candidates:
--            uptodate_build = getUtility(IBuildSet).getByBuildID(job.build.id)
++            uptodate_build = getUtility(IBuildSet).getByQueueEntry(job)
              if uptodate_build.buildstate != BuildStatus.NEEDSBUILD:
                  continue
              job.score()
 === added directory 'lib/lp/buildmaster/model'
 === added file 'lib/lp/buildmaster/model/__init__.py'
 === added file 'lib/lp/buildmaster/model/buildfarmjob.py'
 --- lib/lp/buildmaster/model/buildfarmjob.py	1970-01-01 00:00:00 +0000
 +++ lib/lp/buildmaster/model/buildfarmjob.py	2009-11-16 23:27:14 +0000
@@ -0,0 +1,40 @@
++# Copyright 2009 Canonical Ltd.  This software is licensed under the
++# GNU Affero General Public License version 3 (see the file LICENSE).
++
++__metaclass__ = type
++__all__ = ['BuildFarmJob']
++
++
++from zope.interface import implements
++
++from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
++
++
++class BuildFarmJob:
++    """Mix-in class for `IBuildFarmJob` implementations."""
++    implements(IBuildFarmJob)
++
++    def score(self):
++        """See `IBuildFarmJob`."""
++        raise NotImplementedError
++
++    def getLogFileName(self):
++        """See `IBuildFarmJob`."""
++        raise NotImplementedError
++
++    def getName(self):
++        """See `IBuildFarmJob`."""
++        raise NotImplementedError
++
++    def jobStarted(self):
++        """See `IBuildFarmJob`."""
++        pass
++
++    def jobReset(self):
++        """See `IBuildFarmJob`."""
++        pass
++
++    def jobAborted(self):
++        """See `IBuildFarmJob`."""
++        pass
++
 === modified file 'lib/lp/buildmaster/tests/queuebuilder.txt'
 --- lib/lp/buildmaster/tests/queuebuilder.txt	2009-10-26 18:40:04 +0000
 +++ lib/lp/buildmaster/tests/queuebuilder.txt	2009-11-16 23:27:14 +0000
@@ -229,7 +229,7 @@
      >>> copied_pub = pub_failed.copyTo(
      ...     hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
--    >>> from lp.soyuz.interfaces.build import BuildStatus
++    >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
      >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
      ...     warty['i386'], PackagePublishingPocket.RELEASE,
      ...     warty.main_archive, status=BuildStatus.FAILEDTOBUILD)
@@ -343,7 +343,8 @@
  happen in parallel with build creation.
      >>> build_queue = active_jobs[0]
--    >>> print build_queue.build.title
++    >>> build = getUtility(IBuildSet).getByQueueEntry(build_queue)
++    >>> print build.title
      i386 build of test-buildd 667 in ubuntu hoary RELEASE
      >>> build_queue.lastscore
@@ -351,15 +352,15 @@
  Check the published component name retriever, they might be different,
  i.e., the published component can be different than the original component.
--    >>> print build_queue.build.current_component.name
++    >>> print build.current_component.name
      main
--    >>> print build_queue.build.sourcepackagerelease.component.name
++    >>> print build.sourcepackagerelease.component.name
      main
  Missing BuildQueue records, resulting from given-back builds, are
  created in the last stage of the queue-builder script.
--    >>> given_back_build = build_queue.build
++    >>> given_back_build = getUtility(IBuildSet).getByQueueEntry(build_queue)
      >>> build_queue.destroySelf()
      >>> flush_database_updates()
 === modified file 'lib/lp/buildmaster/tests/test_manager.py'
 --- lib/lp/buildmaster/tests/test_manager.py	2009-09-07 13:02:02 +0000
 +++ lib/lp/buildmaster/tests/test_manager.py	2009-11-16 23:27:14 +0000
@@ -24,7 +24,7 @@
  from lp.buildmaster.tests.harness import BuilddManagerTestSetup
  from canonical.launchpad.ftests import ANONYMOUS, login
  from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave
--from lp.soyuz.interfaces.build import BuildStatus
++from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
  from lp.soyuz.interfaces.builder import IBuilderSet
  from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
  from lp.registry.interfaces.distribution import IDistributionSet
@@ -494,8 +494,9 @@
          self.assertTrue(job is not None)
          self.assertEqual(job.builder, builder)
--        self.assertTrue(job.buildstart is not None)
--        self.assertEqual(job.build.buildstate, BuildStatus.BUILDING)
++        self.assertTrue(job.date_started is not None)
++        build = getUtility(IBuildSet).getByQueueEntry(job)
++        self.assertEqual(build.buildstate, BuildStatus.BUILDING)
          self.assertEqual(job.logtail, logtail)
      def _getManager(self):
@@ -617,8 +618,9 @@
          job = getUtility(IBuildQueueSet).get(job.id)
          self.assertTrue(job.builder is None)
--        self.assertTrue(job.buildstart is None)
--        self.assertEqual(job.build.buildstate, BuildStatus.NEEDSBUILD)
++        self.assertTrue(job.date_started is None)
++        build = getUtility(IBuildSet).getByQueueEntry(job)
++        self.assertEqual(build.buildstate, BuildStatus.NEEDSBUILD)
      def testScanRescuesJobFromBrokenBuilder(self):
          # The job assigned to a broken builder is rescued.
@@ -701,13 +703,14 @@
          builder.builderok = True
          job = builder.currentjob
++        build = getUtility(IBuildSet).getByQueueEntry(job)
          self.assertEqual(
              'i386 build of mozilla-firefox 0.9 in ubuntu hoary RELEASE',
--            job.build.title)
++            build.title)
--        self.assertEqual('BUILDING', job.build.buildstate.name)
++        self.assertEqual('BUILDING', build.buildstate.name)
          self.assertNotEqual(None, job.builder)
--        self.assertNotEqual(None, job.buildstart)
++        self.assertNotEqual(None, job.date_started)
          self.assertNotEqual(None, job.logtail)
          transaction.commit()
@@ -717,9 +720,10 @@
      def assertJobIsClean(self, job_id):
          """Re-fetch the `IBuildQueue` record and check if it's clean."""
          job = getUtility(IBuildQueueSet).get(job_id)
--        self.assertEqual('NEEDSBUILD', job.build.buildstate.name)
++        build = getUtility(IBuildSet).getByQueueEntry(job)
++        self.assertEqual('NEEDSBUILD', build.buildstate.name)
          self.assertEqual(None, job.builder)
--        self.assertEqual(None, job.buildstart)
++        self.assertEqual(None, job.date_started)
          self.assertEqual(None, job.logtail)
      def testResetDispatchResult(self):
 === modified file 'lib/lp/registry/interfaces/distroseries.py'
 --- lib/lp/registry/interfaces/distroseries.py	2009-11-07 16:14:22 +0000
 +++ lib/lp/registry/interfaces/distroseries.py	2009-11-16 23:27:14 +0000
@@ -851,6 +851,12 @@
          :return: A string.
          """
++    def isSourcePackageFormatPermitted(format):
++        """Check if the specified source format is allowed in this series.
++
++        :param format: The SourcePackageFormat to check.
++        """
++
  class IDistroSeries(IDistroSeriesEditRestricted, IDistroSeriesPublic,
                      IStructuralSubscriptionTarget):
 === modified file 'lib/lp/registry/interfaces/sourcepackage.py'
 --- lib/lp/registry/interfaces/sourcepackage.py	2009-11-15 23:23:12 +0000
 +++ lib/lp/registry/interfaces/sourcepackage.py	2009-11-16 23:27:14 +0000
@@ -284,7 +284,7 @@
          which in turn lists the orig.tar.gz and diff.tar.gz files used to
          make up the package.  """)
--    ORIG = DBItem(4, """
++    ORIG_TARBALL = DBItem(4, """
          Orig Tarball
          This file is an Ubuntu "orig" file, typically an upstream tarball or
@@ -298,8 +298,8 @@
          diff creates additional directories with patches and documentation
          used to build the binary packages for Ubuntu.  """)
--    TARBALL = DBItem(6, """
--        Tarball
++    NATIVE_TARBALL = DBItem(6, """
++        Native Tarball
          This is a tarball, usually of a mixture of Ubuntu and upstream code,
          used in the build process for this source package.  """)
 === modified file 'lib/lp/registry/model/distroseries.py'
 --- lib/lp/registry/model/distroseries.py	2009-11-07 16:14:22 +0000
 +++ lib/lp/registry/model/distroseries.py	2009-11-16 23:27:14 +0000
@@ -118,6 +118,8 @@
  from canonical.launchpad.webapp.interfaces import (
      IStoreSelector, MAIN_STORE, NotFoundError, SLAVE_FLAVOR,
      TranslationUnavailable)
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelectionSet)
  class SeriesMixin:
@@ -1496,7 +1498,7 @@
          cur = cursor()
          # Perform the copies
--        self._copy_component_and_section_selections(cur)
++        self._copy_component_section_and_format_selections(cur)
          # Prepare the list of distroarchseries for which binary packages
          # shall be copied.
@@ -1557,9 +1559,9 @@
                  PackagePublishingPocket.RELEASE)
              clone_packages(origin, destination, distroarchseries_list)
--    def _copy_component_and_section_selections(self, cur):
--        """Copy the section and component selections from the parent distro
--        series into this one.
++    def _copy_component_section_and_format_selections(self, cur):
++        """Copy the section, component and format selections from the parent
++        distro series into this one.
          """
          # Copy the component selections
          cur.execute('''
@@ -1573,6 +1575,13 @@
              SELECT %s as distroseries, ss.section AS section
              FROM SectionSelection AS ss WHERE ss.distroseries = %s
              ''' % sqlvalues(self.id, self.parent_series.id))
++        # Copy the source format selections
++        cur.execute('''
++            INSERT INTO SourcePackageFormatSelection (distroseries, format)
++            SELECT %s as distroseries, spfs.format AS format
++            FROM SourcePackageFormatSelection AS spfs
++            WHERE spfs.distroseries = %s
++            ''' % sqlvalues(self.id, self.parent_series.id))
      def copyTranslationsFromParent(self, transaction, logger=None):
          """See `IDistroSeries`."""
@@ -1739,6 +1748,10 @@
          else:
              return '%s%s' % (self.name, pocketsuffix[pocket])
++    def isSourcePackageFormatPermitted(self, format):
++        return getUtility(ISourcePackageFormatSelectionSet
++            ).getBySeriesAndFormat(self, format) is not None
++
  class DistroSeriesSet:
      implements(IDistroSeriesSet)
 === modified file 'lib/lp/registry/model/sourcepackage.py'
 --- lib/lp/registry/model/sourcepackage.py	2009-11-15 23:23:12 +0000
 +++ lib/lp/registry/model/sourcepackage.py	2009-11-16 23:27:14 +0000
@@ -554,8 +554,10 @@
          # It should present the builds in a more natural order.
          if build_state in [BuildStatus.NEEDSBUILD, BuildStatus.BUILDING]:
              orderBy = ["-BuildQueue.lastscore"]
++            clauseTables.append('BuildPackageJob')
++            condition_clauses.append('BuildPackageJob.build = Build.id')
              clauseTables.append('BuildQueue')
--            condition_clauses.append('BuildQueue.build = Build.id')
++            condition_clauses.append('BuildQueue.job = BuildPackageJob.job')
          elif build_state == BuildStatus.SUPERSEDED or build_state is None:
              orderBy = ["-Build.datecreated"]
          else:
 === modified file 'lib/lp/services/job/tests/test_job.py'
 --- lib/lp/services/job/tests/test_job.py	2009-07-17 00:26:05 +0000
 +++ lib/lp/services/job/tests/test_job.py	2009-11-16 23:27:14 +0000
@@ -8,6 +8,8 @@
  from unittest import TestLoader
  import pytz
++from zope.component import getUtility
++
  from canonical.database.constants import UTC_NOW
  from canonical.testing import LaunchpadZopelessLayer
  from storm.locals import Store
@@ -17,6 +19,8 @@
  from lp.services.job.interfaces.job import IJob, JobStatus
  from lp.testing import TestCase
  from canonical.launchpad.webapp.testing import verifyObject
++from canonical.launchpad.webapp.interfaces import (
++    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
  class TestJob(TestCase):
@@ -155,40 +159,53 @@
      layer = LaunchpadZopelessLayer
++    def _sampleData(self):
++        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
++        return list(store.execute(Job.ready_jobs))
++
      def test_ready_jobs(self):
          """Job.ready_jobs should include new jobs."""
++        preexisting = self._sampleData()
          job = Job()
          self.assertEqual(
--            [(job.id,)], list(Store.of(job).execute(Job.ready_jobs)))
++            preexisting + [(job.id,)],
++            list(Store.of(job).execute(Job.ready_jobs)))
      def test_ready_jobs_started(self):
          """Job.ready_jobs should not jobs that have been started."""
++        preexisting = self._sampleData()
          job = Job(_status=JobStatus.RUNNING)
          self.assertEqual(
--            [], list(Store.of(job).execute(Job.ready_jobs)))
++            preexisting, list(Store.of(job).execute(Job.ready_jobs)))
      def test_ready_jobs_lease_expired(self):
          """Job.ready_jobs should include jobs with expired leases."""
++        preexisting = self._sampleData()
          UNIX_EPOCH = datetime.fromtimestamp(0, pytz.timezone('UTC'))
          job = Job(lease_expires=UNIX_EPOCH)
          self.assertEqual(
--            [(job.id,)], list(Store.of(job).execute(Job.ready_jobs)))
++            preexisting + [(job.id,)],
++            list(Store.of(job).execute(Job.ready_jobs)))
      def test_ready_jobs_lease_in_future(self):
          """Job.ready_jobs should not include jobs with active leases."""
++        preexisting = self._sampleData()
          future = datetime.fromtimestamp(
              time.time() + 1000, pytz.timezone('UTC'))
          job = Job(lease_expires=future)
--        self.assertEqual([], list(Store.of(job).execute(Job.ready_jobs)))
++        self.assertEqual(
++            preexisting, list(Store.of(job).execute(Job.ready_jobs)))
      def test_ready_jobs_not_jobs_scheduled_in_future(self):
          """Job.ready_jobs does not included jobs scheduled for a time in the
          future.
          """
++        preexisting = self._sampleData()
          future = datetime.fromtimestamp(
              time.time() + 1000, pytz.timezone('UTC'))
          job = Job(scheduled_start=future)
--        self.assertEqual([], list(Store.of(job).execute(Job.ready_jobs)))
++        self.assertEqual(
++            preexisting, list(Store.of(job).execute(Job.ready_jobs)))
      def test_acquireLease(self):
          """Job.acquireLease should set job.lease_expires."""
 === modified file 'lib/lp/soyuz/browser/build.py'
 --- lib/lp/soyuz/browser/build.py	2009-10-26 18:40:04 +0000
 +++ lib/lp/soyuz/browser/build.py	2009-11-16 23:27:14 +0000
@@ -288,10 +288,10 @@
      prefetched_data = dict()
      build_ids = [build.id for build in builds]
      results = getUtility(IBuildQueueSet).getForBuilds(build_ids)
--    for (buildqueue, builder) in results:
++    for (buildqueue, _builder, build_job) in results:
          # Get the build's id, 'buildqueue', 'sourcepackagerelease' and
          # 'buildlog' (from the result set) respectively.
--        prefetched_data[buildqueue.build.id] = buildqueue
++        prefetched_data[build_job.build.id] = buildqueue
      complete_builds = []
      for build in builds:
 === modified file 'lib/lp/soyuz/browser/builder.py'
 --- lib/lp/soyuz/browser/builder.py	2009-09-17 14:45:15 +0000
 +++ lib/lp/soyuz/browser/builder.py	2009-11-16 23:27:14 +0000
@@ -237,12 +237,12 @@
      def current_build_duration(self):
          """Return the delta representing the duration of the current job."""
          if (self.context.currentjob is None or
--            self.context.currentjob.buildstart is None):
++            self.context.currentjob.date_started is None):
              return None
          else:
              UTC = pytz.timezone('UTC')
--            buildstart = self.context.currentjob.buildstart
--            return datetime.datetime.now(UTC) - buildstart
++            date_started = self.context.currentjob.date_started
++            return datetime.datetime.now(UTC) - date_started
      @property
      def page_title(self):
 === modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
 --- lib/lp/soyuz/browser/tests/builder-views.txt	2009-09-16 19:06:48 +0000
 +++ lib/lp/soyuz/browser/tests/builder-views.txt	2009-11-16 23:27:14 +0000
@@ -1,7 +1,7 @@
  = Builder View Classes and Pages =
      >>> from zope.component import getMultiAdapter, getUtility
--    >>> from canonical.launchpad.interfaces import IBuilderSet
++    >>> from canonical.launchpad.interfaces import IBuildSet, IBuilderSet
      >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
      >>> builder = getUtility(IBuilderSet).get(1)
@@ -158,7 +158,8 @@
      >>> frog = getUtility(IBuilderSet)['frog']
      >>> frog.builderok = True
      >>> private_build.builder = frog
--    >>> private_job = BuildQueue(build=private_build, builder=frog)
++    >>> private_job = private_build.createBuildQueueEntry()
++    >>> private_job.builder = frog
      >>> private_job_id = private_job.id
      >>> from canonical.database.sqlbase import flush_database_caches
@@ -175,7 +176,9 @@
      >>> print frog.builderok
      True
--    >>> print frog.currentjob.build.title
++    >>> build_set = getUtility(IBuildSet)
++    >>> build = build_set.getByQueueEntry(frog.currentjob)
++    >>> print build.title
      i386 build of privacy-test 666 in ubuntutest breezy-autotest RELEASE
      >>> print frog.failnotes
@@ -199,7 +202,8 @@
      >>> print admin_view.context.builderok
      True
--    >>> print admin_view.context.currentjob.build.title
++    >>> build = build_set.getByQueueEntry(admin_view.context.currentjob)
++    >>> print build.title
      i386 build of privacy-test 666 in ubuntutest breezy-autotest RELEASE
      >>> print admin_view.context.failnotes
@@ -211,7 +215,7 @@
      >>> import datetime
      >>> import pytz
--    >>> private_job.buildstart = (
++    >>> private_job.setDateStarted(
      ...     datetime.datetime.now(pytz.UTC) - datetime.timedelta(10))
      >>> print admin_view.current_build_duration
 days...
 === modified file 'lib/lp/soyuz/configure.zcml'
 --- lib/lp/soyuz/configure.zcml	2009-11-09 17:59:18 +0000
 +++ lib/lp/soyuz/configure.zcml	2009-11-16 23:27:14 +0000
@@ -560,7 +560,7 @@
          <require
              permission="zope.Public"
--            set_attributes="lastscore builder buildstart logtail"/>
++            set_attributes="lastscore builder logtail date_started"/>
      </class>
      <!-- BuildQueueSet -->
@@ -791,6 +791,28 @@
              interface="lp.soyuz.interfaces.section.ISectionSet"/>
      </securedutility>
++    <!-- SourcePackageFormatSelection -->
++
++    <class
++        class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelection">
++        <allow
++            interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelection"/>
++    </class>
++
++    <!-- SourcePackageFormatSelectionSet -->
++
++    <class
++        class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelectionSet">
++        <allow
++            interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet"/>
++    </class>
++    <securedutility
++        class="lp.soyuz.model.sourcepackageformat.SourcePackageFormatSelectionSet"
++        provides="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet">
++        <allow
++            interface="lp.soyuz.interfaces.sourcepackageformat.ISourcePackageFormatSelectionSet"/>
++    </securedutility>
++
      <!-- SourcePackageReleaseFile -->
      <class
@@ -863,5 +885,11 @@
              interface="lp.soyuz.interfaces.packagesetgroup.IPackagesetGroup"/>
      </class>
++    <!-- BuildPackageJob -->
++    <class
++        class="lp.soyuz.model.buildpackagejob.BuildPackageJob">
++        <allow
++            interface="lp.soyuz.interfaces.buildpackagejob.IBuildPackageJob"/>
++    </class>
  </configure>
 === modified file 'lib/lp/soyuz/doc/archive.txt'
 --- lib/lp/soyuz/doc/archive.txt	2009-11-09 13:01:13 +0000
 +++ lib/lp/soyuz/doc/archive.txt	2009-11-16 23:27:14 +0000
@@ -850,7 +850,7 @@
      >>> print_published_files(cprov_archive)
      cdrkit - 1.0: foobar-1.0.dsc (DSC, 716 bytes)
--    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
++    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
      iceweasel - 1.0: iceweasel-1.0.dsc (DSC, 123 bytes)
  Now we will emulate a duplicated reference to the same 'orig.tar.gz',
@@ -867,9 +867,9 @@
  'firefox_0.9.2.orig.tar.gz' file.
      >>> print_published_files(cprov_archive)
--    cdrkit - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
++    cdrkit - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
      cdrkit - 1.0: foobar-1.0.dsc (DSC, 716 bytes)
--    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG, 9922560 bytes)
++    iceweasel - 1.0: firefox_0.9.2.orig.tar.gz (ORIG_TARBALL, 9922560 bytes)
      iceweasel - 1.0: iceweasel-1.0.dsc (DSC, 123 bytes)
  Similarly to what happen in the archive disk 'pool', where already
 === modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
 --- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2009-08-28 07:34:44 +0000
 +++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2009-11-16 23:27:14 +0000
@@ -59,7 +59,8 @@
      >>> UTC = pytz.timezone('UTC')
      >>> bob_the_builder = builder_set.get(1)
      >>> cur_bqueue = bob_the_builder.currentjob
--    >>> cur_build = cur_bqueue.build
++    >>> from lp.soyuz.interfaces.build import IBuildSet
++    >>> cur_build = getUtility(IBuildSet).getByQueueEntry(cur_bqueue)
  Make sure the job at hand is currently being built.
@@ -73,16 +74,16 @@
  of job N in the build queue. These values will now be set for the job
  that is currently building.
++    >>> from zope.security.proxy import removeSecurityProxy
      >>> cur_bqueue.lastscore = 1111
--    >>> cur_bqueue.buildstart = datetime(2008, 4, 1, 10, 45, 39,
--    ...                                  tzinfo=UTC)
--    >>> print cur_bqueue.buildstart
++    >>> cur_bqueue.setDateStarted(
++    ...     datetime(2008, 4, 1, 10, 45, 39, tzinfo=UTC))
++    >>> print cur_bqueue.date_started
 -04-01 10:45:39+00:00
  Please note that the "estimated build duration" is an internal property
  and not meant to be viewed or modified by an end user.
--    >>> from zope.security.proxy import removeSecurityProxy
      >>> naked_build = removeSecurityProxy(cur_build)
      >>> naked_build.estimated_build_duration = timedelta(minutes=56)
 === modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
 --- lib/lp/soyuz/doc/buildd-dispatching.txt	2009-10-14 08:20:40 +0000
 +++ lib/lp/soyuz/doc/buildd-dispatching.txt	2009-11-16 23:27:14 +0000
@@ -134,18 +134,20 @@
      >>> job.id
--    >>> job.build.buildstate.name
++    >>> from lp.soyuz.interfaces.build import IBuildSet
++    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
++    >>> build.buildstate.name
      'NEEDSBUILD'
      >>> job.builder is None
      True
--    >>> job.buildstart is None
++    >>> job.date_started is None
      True
--    >>> job.is_virtualized
++    >>> build.is_virtualized
      False
  The build start time is not set yet either.
--    >>> print job.build.date_first_dispatched
++    >>> print build.date_first_dispatched
      None
  Update the SourcePackageReleaseFile corresponding to this job:
@@ -154,7 +156,7 @@
      >>> alias_id = librarian_client.addFile(
      ...    'foo.dsc', len(content), StringIO(content), 'application/dsc')
--    >>> sprf = job.build.sourcepackagerelease.files[0]
++    >>> sprf = build.sourcepackagerelease.files[0]
      >>> from zope.security.proxy import removeSecurityProxy
      >>> naked_sprf = removeSecurityProxy(sprf)
      >>> naked_sprf.libraryfile = getUtility(ILibraryFileAliasSet)[alias_id]
@@ -167,35 +169,20 @@
  Verify if the job (BuildQueue) was updated appropriately:
--    >>> def checkTimes(expected, actual):
--    ...     if expected != actual:
--    ...         return "expected: %s, actual: %s" % (expected, actual)
--    ...     else:
--    ...         return "OK"
--
      >>> job.builder.id == bob_builder.id
      True
--    >>> job.build.buildstate.name
++    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
++    >>> build.buildstate.name
      'BUILDING'
--    >>> from canonical.database.sqlbase import get_transaction_timestamp
--    >>> checkTimes(get_transaction_timestamp(), job.buildstart)
--    'OK'
--
--The build start time will be set to the same value.
--
--    >>> checkTimes(get_transaction_timestamp(),
--    ...            job.build.date_first_dispatched)
--    'OK'
--
  Shutdown builder, mark the build record as failed and remove the
  buildqueue record, so the build was eliminated:
      >>> BuilddSlaveTestSetup().tearDown()
      >>> from lp.soyuz.interfaces.build import BuildStatus
--    >>> job.build.buildstate = BuildStatus.FAILEDTOBUILD
++    >>> build.buildstate = BuildStatus.FAILEDTOBUILD
      >>> job.destroySelf()
      >>> flush_database_updates()
@@ -217,12 +204,13 @@
      >>> ppa_job.builder == None
      True
--    >>> ppa_job.buildstart == None
++    >>> ppa_job.date_started == None
      True
  The build job's archive requires virtualized builds.
--    >>> ppa_job.build.archive.require_virtualized
++    >>> build = getUtility(IBuildSet).getByQueueEntry(ppa_job)
++    >>> build.archive.require_virtualized
      True
  But the builder is not virtualized.
@@ -249,10 +237,10 @@
      >>> from lp.soyuz.model.publishing import (
      ...     SourcePackagePublishingHistory)
      >>> [old_pub] = SourcePackagePublishingHistory.selectBy(
--    ...    distroseries=ppa_job.build.distroseries,
--    ...    sourcepackagerelease=ppa_job.build.sourcepackagerelease)
++    ...    distroseries=build.distroseries,
++    ...    sourcepackagerelease=build.sourcepackagerelease)
      >>> new_pub = old_pub.copyTo(
--    ...     old_pub.distroseries, old_pub.pocket, ppa_job.build.archive)
++    ...     old_pub.distroseries, old_pub.pocket, build.archive)
      >>> bob_builder.virtualized = True
      >>> syncUpdate(bob_builder)
@@ -293,19 +281,16 @@
      >>> ppa_job.builder.name
      u'bob'
--    >>> ppa_job.build.buildstate.name
++    >>> build.buildstate.name
      'BUILDING'
--    >>> ppa_job.buildstart == get_transaction_timestamp()
--    True
--
  Shutdown builder slave, mark the ppa build record as failed, remove the
  buildqueue record and make 'bob' builder non-virtual again,  so the
  environment is back to the initial state.
      >>> BuilddSlaveTestSetup().tearDown()
--    >>> ppa_job.build.buildstate = BuildStatus.FAILEDTOBUILD
++    >>> build.buildstate = BuildStatus.FAILEDTOBUILD
      >>> ppa_job.destroySelf()
      >>> bob_builder.virtualized = False
      >>> flush_database_updates()
@@ -332,9 +317,9 @@
      >>> print sec_job.builder
      None
--    >>> print sec_job.buildstart
++    >>> print sec_job.date_started
      None
--    >>> sec_job.is_virtualized
++    >>> sec_build.is_virtualized
      False
  In normal conditions the next available candidate would be the job
 === modified file 'lib/lp/soyuz/doc/buildd-scoring.txt'
 --- lib/lp/soyuz/doc/buildd-scoring.txt	2009-08-30 23:57:41 +0000
 +++ lib/lp/soyuz/doc/buildd-scoring.txt	2009-11-16 23:27:14 +0000
@@ -49,7 +49,7 @@
      >>> def setUpBuildQueueEntry(
      ...     component_name='main', urgency=SourcePackageUrgency.HIGH,
      ...     pocket=PackagePublishingPocket.RELEASE,
--    ...     date_created=LOCAL_NOW, manual=False):
++    ...     date_created=LOCAL_NOW, manual=False, archive=None):
      ...     global version
      ...     commit()
      ...     LaunchpadZopelessLayer.switchDbUser('launchpad')
@@ -57,7 +57,7 @@
      ...        sourcename='test-build', version=str(version),
      ...        distroseries=hoary, component=component_name,
      ...        urgency=urgency, pocket=pocket,
--    ...        status=PackagePublishingStatus.PUBLISHED)
++    ...        status=PackagePublishingStatus.PUBLISHED, archive=archive)
      ...     commit()
      ...     LaunchpadZopelessLayer.switchDbUser(test_dbuser)
      ...     version += 1
@@ -65,7 +65,7 @@
      ...         hoary386, pub.pocket, pub.archive)
      ...
      ...     build_queue = build.createBuildQueueEntry()
--    ...     build_queue.created = date_created
++    ...     build_queue.job.date_created = date_created
      ...     build_queue.manual = manual
      ...
      ...     return build_queue
@@ -86,8 +86,10 @@
      >>> commit()
      >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
--    >>> bq0.build.archive.buildd_secret = "secret"
--    >>> bq0.build.archive.private = True
++    >>> from lp.soyuz.interfaces.build import IBuildSet
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bq0)
++    >>> build.archive.buildd_secret = "secret"
++    >>> build.archive.private = True
      >>> bq0.score()
      >>> bq0.lastscore
@@ -96,19 +98,19 @@
  IArchive.relative_build_score to boost by 100 changes the lastscore value
  appropriately.
--    >>> bq0.build.archive.relative_build_score = 100
++    >>> build.archive.relative_build_score = 100
      >>> bq0.score()
      >>> bq0.lastscore
  The delta can also be negative.
--    >>> bq0.build.archive.relative_build_score = -100
++    >>> build.archive.relative_build_score = -100
      >>> bq0.score()
      >>> bq0.lastscore
--    >>> bq0.build.archive.relative_build_score = 0
++    >>> build.archive.relative_build_score = 0
      >>> LaunchpadZopelessLayer.switchDbUser(test_dbuser)
@@ -250,9 +252,15 @@
  they all have a fixed score of -10. They will get built in the order
  they were created.
--    >>> from canonical.launchpad.interfaces import ArchivePurpose
--    >>> bqc = setUpBuildQueueEntry()
--    >>> bqc.build.archive.purpose = ArchivePurpose.COPY
++    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
++    >>> from canonical.launchpad.interfaces import (
++    ...     ArchivePurpose, IArchiveSet)
++    >>> copy = getUtility(IArchiveSet).new(
++    ...     owner=ubuntu.owner, purpose=ArchivePurpose.COPY,
++    ...     name='test-rebuild')
++
++    >>> bqc = setUpBuildQueueEntry(archive=copy)
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqc)
      >>> bqc.score()
      >>> bqc.lastscore
      -10
 === modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
 --- lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-11-05 10:51:36 +0000
 +++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-11-16 23:27:14 +0000
@@ -188,10 +188,11 @@
  To make testing easier we provide a convenience function to put a BuildQueue
  object into a preset fixed state:
++    >>> from zope.security.proxy import removeSecurityProxy
      >>> default_start = datetime.datetime(2005, 1, 1, 8, 0, 0, tzinfo=UTC)
      >>> def setupBuildQueue(build_queue, builder):
      ...      build_queue.builder = builder
--    ...      build_queue.buildstart = default_start
++    ...      build_queue.setDateStarted(default_start)
  Remove any previous buildmaster ROOT directory, to avoid any garbage
  lock conflict (it would be recreated automatically if necessary)
@@ -216,7 +217,7 @@
      >>> from canonical.launchpad.ftests import syncUpdate
      >>> if a_builder.currentjob is not None:
      ...     currentjob = a_builder.currentjob
--    ...     currentjob.buildstart = None
++    ...     currentjob.setDateStarted(None)
      ...     currentjob.builder = None
      ...     syncUpdate(currentjob)
@@ -236,17 +237,18 @@
  Do the test execution:
      >>> buildergroup.updateBuild(bqItem3)
--    >>> bqItem3.build.builder is not None
--    True
--    >>> bqItem3.build.datebuilt is not None
--    True
--    >>> bqItem3.build.buildduration is not None
--    True
--    >>> bqItem3.build.buildlog is not None
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
++    >>> build.builder is not None
++    True
++    >>> build.datebuilt is not None
++    True
++    >>> build.buildduration is not None
++    True
++    >>> build.buildlog is not None
      True
      >>> check_mail_sent(last_stub_mail_count)
      True
--    >>> bqItem3.build.buildstate.title
++    >>> build.buildstate.title
      'Failed to build'
  Cleanup in preparation for the next test:
@@ -270,19 +272,20 @@
      >>> buildergroup.updateBuild(bqItem4)
      CRITICAL:root:***** bob is MANUALDEPWAIT *****
--    >>> bqItem4.build.builder is not None
--    True
--    >>> bqItem4.build.datebuilt is not None
--    True
--    >>> bqItem4.build.buildduration is not None
--    True
--    >>> bqItem4.build.buildlog is not None
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem4)
++    >>> build.builder is not None
++    True
++    >>> build.datebuilt is not None
++    True
++    >>> build.buildduration is not None
++    True
++    >>> build.buildlog is not None
      True
      >>> check_mail_sent(last_stub_mail_count)
      False
--    >>> bqItem4.build.dependencies
++    >>> build.dependencies
      u'baz (>= 1.0.1)'
--    >>> bqItem4.build.buildstate.title
++    >>> build.buildstate.title
      'Dependency wait'
  Cleanup in preparation for the next test:
@@ -302,17 +305,18 @@
      ...     WaitingSlave('BuildStatus.CHROOTFAIL'))
      >>> buildergroup.updateBuild(bqItem5)
      CRITICAL:root:***** bob is CHROOTWAIT *****
--    >>> bqItem5.build.builder is not None
--    True
--    >>> bqItem5.build.datebuilt is not None
--    True
--    >>> bqItem5.build.buildduration is not None
--    True
--    >>> bqItem5.build.buildlog is not None
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem5)
++    >>> build.builder is not None
++    True
++    >>> build.datebuilt is not None
++    True
++    >>> build.buildduration is not None
++    True
++    >>> build.buildlog is not None
      True
      >>> check_mail_sent(last_stub_mail_count)
      True
--    >>> bqItem5.build.buildstate.title
++    >>> build.buildstate.title
      'Chroot problem'
  Cleanup in preparation for the next test:
@@ -343,7 +347,8 @@
      True
      >>> check_mail_sent(last_stub_mail_count)
      False
--    >>> bqItem6.build.buildstate.title
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem6)
++    >>> build.buildstate.title
      'Needs building'
  Cleanup in preparation for the next test:
@@ -384,6 +389,8 @@
      >>> setupBuildQueue(bqItem8, a_builder)
      >>> last_stub_mail_count = len(stub.test_emails)
++    >>> bqItem8.builder.setSlaveForTesting(BuildingSlave())
++    >>> buildergroup.updateBuild(bqItem8)
      >>> bqItem8.builder.setSlaveForTesting(AbortedSlave())
      >>> bqItem8.builder.name
      u'bob'
@@ -445,17 +452,18 @@
  FAILEDTOUPLOAD:
      >>> buildergroup.updateBuild(bqItem10)
--    >>> bqItem10.build.builder is not None
--    True
--    >>> bqItem10.build.datebuilt is not None
--    True
--    >>> bqItem10.build.buildduration is not None
--    True
--    >>> bqItem10.build.buildlog is not None
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
++    >>> build.builder is not None
++    True
++    >>> build.datebuilt is not None
++    True
++    >>> build.buildduration is not None
++    True
++    >>> build.buildlog is not None
      True
      >>> check_mail_sent(last_stub_mail_count)
      True
--    >>> bqItem10.build.buildstate.title
++    >>> build.buildstate.title
      'Failed to upload'
  Let's check the emails generated by this 'failure'
@@ -493,7 +501,7 @@
  output is both emailed in an immediate notification, and stored in the
  librarian for future reference.
--    >>> bqItem10.build.upload_log is not None
++    >>> build.upload_log is not None
      True
  What we can clearly notice is that the buildlog is still containing
@@ -514,16 +522,16 @@
      >>> bqItem10 = getUtility(IBuildSet).getByBuildID(
      ...     6).createBuildQueueEntry()
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
  XXX: The pocket attribute is not intended to be changed in regular code, but
  for this test we want to change it on the fly. An alternative would be to add
  new sample data for a build that can be uploaded with binary packages attached
  to it.
--    >>> from zope.security.proxy import removeSecurityProxy
      >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
      >>> removeSecurityProxy(
--    ...     bqItem10.build).pocket = PackagePublishingPocket.UPDATES
++    ...     build).pocket = PackagePublishingPocket.UPDATES
      >>> setupBuildQueue(bqItem10, a_builder)
      >>> last_stub_mail_count = len(stub.test_emails)
@@ -535,22 +543,22 @@
  the build record to FULLYBUILT, as the process-upload would do:
      >>> from canonical.launchpad.interfaces import BuildStatus
--    >>> bqItem10.build.buildstate = BuildStatus.FULLYBUILT
++    >>> build.buildstate = BuildStatus.FULLYBUILT
  Now the updateBuild should recognize this build record as a
  Successfully built and uploaded procedure, not sending any
  notification and updating the build information:
      >>> buildergroup.updateBuild(bqItem10)
--    >>> bqItem10.build.builder is not None
--    True
--    >>> bqItem10.build.datebuilt is not None
--    True
--    >>> bqItem10.build.buildduration is not None
--    True
--    >>> bqItem10.build.buildlog is not None
--    True
--    >>> bqItem10.build.buildstate.title
++    >>> build.builder is not None
++    True
++    >>> build.datebuilt is not None
++    True
++    >>> build.buildduration is not None
++    True
++    >>> build.buildlog is not None
++    True
++    >>> build.buildstate.title
      'Successfully built'
      >>> check_mail_sent(last_stub_mail_count)
      False
@@ -558,7 +566,7 @@
  We do not store any build log information when the binary upload
  processing succeeded.
--    >>> bqItem10.build.upload_log is None
++    >>> build.upload_log is None
      True
  Cleanup in preparation for the next test:
@@ -585,13 +593,14 @@
      >>> bqItem11.builder is None
      True
--    >>> bqItem11.buildstart is None
++    >>> bqItem11.date_started is None
      True
      >>> bqItem11.lastscore
      >>> check_mail_sent(last_stub_mail_count)
      False
--    >>> bqItem11.build.buildstate.title
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem11)
++    >>> build.buildstate.title
      'Needs building'
  Cleanup in preparation for the next test:
@@ -790,11 +799,11 @@
  tests.
      >>> current_job = a_builder.currentjob
--    >>> resurrect_build = current_job.build
++    >>> resurrect_build = getUtility(IBuildSet).getByQueueEntry(current_job)
      >>> resurrect_build.buildstate = BuildStatus.NEEDSBUILD
      >>> syncUpdate(resurrect_build)
      >>> current_job.builder = None
--    >>> current_job.buildstart = None
++    >>> current_job.setDateStarted(None)
      >>> syncUpdate(current_job)
  IBuilder.findCandidate also identifies if there are builds for
@@ -802,7 +811,8 @@
  corresponding build record as SUPERSEDED.
      >>> old_candidate = a_builder.findBuildCandidate()
--    >>> print old_candidate.build.buildstate.name
++    >>> build = getUtility(IBuildSet).getByQueueEntry(old_candidate)
++    >>> print build.buildstate.name
      NEEDSBUILD
  The 'candidate' is constant until we dispatch it.
@@ -814,7 +824,7 @@
  Now let's disable the archive of the associated build record and see
  whether the candidate will still be found.
--    >>> old_candidate.build.archive.enabled = False
++    >>> build.archive.enabled = False
      >>> new_candidate = a_builder.findBuildCandidate()
      >>> new_candidate is None
      True
@@ -823,7 +833,7 @@
  archives are ignored. Now let's re-enable that archive and the build
  candidate will be found again.
--    >>> old_candidate.build.archive.enabled = True
++    >>> build.archive.enabled = True
      >>> new_candidate = a_builder.findBuildCandidate()
      >>> new_candidate.id == old_candidate.id
      True
@@ -836,9 +846,9 @@
      >>> from canonical.launchpad.interfaces import PackagePublishingStatus
      >>> from canonical.testing.layers import LaunchpadZopelessLayer
--    >>> spr = old_candidate.build.sourcepackagerelease
++    >>> spr = build.sourcepackagerelease
      >>> secure_pub = removeSecurityProxy(
--    ...     old_candidate).build.current_source_publication.secure_record
++    ...     build).current_source_publication.secure_record
      >>> commit()
      >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
      >>> secure_pub.status = PackagePublishingStatus.SUPERSEDED
@@ -854,7 +864,7 @@
  Because the 'previous' candidate was marked as superseded, so it's not
  part of the candidates list anymore.
--    >>> print old_candidate.build.buildstate.name
++    >>> print build.buildstate.name
      SUPERSEDED
  If the candidate is for a private build whose source has not been
@@ -862,9 +872,10 @@
  published.  We need to tweak the status of the publishing record again
  to demonstrate this, and also make the archive private:
--    >>> source = new_candidate.build.sourcepackagerelease
++    >>> build = getUtility(IBuildSet).getByQueueEntry(new_candidate)
++    >>> source = build.sourcepackagerelease
      >>> secure_pub = removeSecurityProxy(
--    ...     new_candidate).build.current_source_publication.secure_record
++    ...     build).current_source_publication.secure_record
      >>> commit()
      >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
      >>> secure_pub.status = PackagePublishingStatus.PENDING
@@ -903,22 +914,23 @@
      >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
      >>> secure_pub = removeSecurityProxy(
--    ...     new_candidate).build.current_source_publication.secure_record
++    ...     build).current_source_publication.secure_record
      >>> secure_pub.status = PackagePublishingStatus.DELETED
      >>> secure_pub = removeSecurityProxy(
--    ...     new_candidate).build.current_source_publication.secure_record
++    ...     build).current_source_publication.secure_record
      >>> secure_pub.status = PackagePublishingStatus.SUPERSEDED
      >>> commit()
      >>> LaunchpadZopelessLayer.switchDbUser(config.builddmaster.dbuser)
--    >>> print current_job.build.buildstate.name
++    >>> build = getUtility(IBuildSet).getByQueueEntry(current_job)
++    >>> print build.buildstate.name
      NEEDSBUILD
      >>> another_candidate = a_builder.findBuildCandidate()
      >>> print another_candidate
      None
--    >>> print current_job.build.buildstate.name
++    >>> print build.buildstate.name
      SUPERSEDED
  We'll reset the archive back to non-private for further tests:
@@ -1147,7 +1159,8 @@
      >>> cprov_archive.private = True
      >>> cprov_archive.buildd_secret = "secret"
      >>> cprov_archive.require_virtualized = False
--    >>> for build_file in candidate.files:
++    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
++    >>> for build_file in build.sourcepackagerelease.files:
      ...     removeSecurityProxy(build_file).libraryfile.restricted = True
      >>> commit()
      >>> LaunchpadZopelessLayer.switchDbUser(test_dbuser)
@@ -1169,7 +1182,8 @@
  archive and not the one from the PPA, which on the absence of ancestry
  defaults to 'universe'.
--    >>> print candidate.build.current_component.name
++    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
++    >>> print build.current_component.name
      main
  This is so that the mangling tools will run over the built packages.
@@ -1196,7 +1210,7 @@
  We will create an ancestry in the primary archive target to the 'main'
  component and this time the dispatching will follow that component.
--    >>> sourcename = candidate.build.sourcepackagerelease.name
++    >>> sourcename = build.sourcepackagerelease.name
      >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
      >>> login('foo.bar@canonical.com')
@@ -1227,14 +1241,14 @@
      >>> candidate = a_build.createBuildQueueEntry()
      >>> setupBuildQueue(candidate, a_builder)
--    >>> candidate.build.upload_log = None
++    >>> build.upload_log = None
      >>> candidate.builder.setSlaveForTesting(WaitingSlave('BuildStatus.OK'))
      >>> buildergroup.updateBuild(candidate)
--    >>> candidate.build.archive.private
++    >>> build.archive.private
      True
--    >>> lfa = candidate.build.buildlog
++    >>> lfa = build.buildlog
      >>> lfa.restricted
      True
      >>> print lfa.filename
@@ -1269,7 +1283,8 @@
      >>> cprov_archive.private = False
      >>> cprov_archive.require_virtualized = True
--    >>> for build_file in candidate.files:
++    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
++    >>> for build_file in build.sourcepackagerelease.files:
      ...     removeSecurityProxy(build_file).libraryfile.restricted = False
      >>> mark_archive = getUtility(IPersonSet).getByName('mark').archive
@@ -1388,7 +1403,8 @@
      >>> a_builder.currentjob.destroySelf()
      >>> bqItem3 = a_build.createBuildQueueEntry()
--    >>> removeSecurityProxy(bqItem3.build).pocket = (
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
++    >>> removeSecurityProxy(build).pocket = (
      ...     PackagePublishingPocket.UPDATES)
      >>> last_stub_mail_count = len(stub.test_emails)
      >>> a_builder.dispatchBuildCandidate(bqItem3)
@@ -1410,7 +1426,7 @@
      >>> a_builder.currentjob.destroySelf()
      >>> bqItem3 = a_build.createBuildQueueEntry()
--    >>> removeSecurityProxy(bqItem3.build).pocket = (
++    >>> removeSecurityProxy(build).pocket = (
      ...     PackagePublishingPocket.PROPOSED)
      >>> last_stub_mail_count = len(stub.test_emails)
      >>> a_builder.dispatchBuildCandidate(bqItem3)
@@ -1433,7 +1449,7 @@
      >>> a_builder.currentjob.destroySelf()
      >>> bqItem3 = a_build.createBuildQueueEntry()
--    >>> removeSecurityProxy(bqItem3.build).pocket = (
++    >>> removeSecurityProxy(build).pocket = (
      ...     PackagePublishingPocket.BACKPORTS)
      >>> last_stub_mail_count = len(stub.test_emails)
      >>> a_builder.dispatchBuildCandidate(bqItem3)
@@ -1456,9 +1472,9 @@
      >>> a_builder.currentjob.destroySelf()
      >>> bqItem3 = a_build.createBuildQueueEntry()
--    >>> removeSecurityProxy(bqItem3.build).buildstate = (
++    >>> removeSecurityProxy(build).buildstate = (
      ...     BuildStatus.NEEDSBUILD)
--    >>> removeSecurityProxy(bqItem3.build).pocket = (
++    >>> removeSecurityProxy(build).pocket = (
      ...     PackagePublishingPocket.SECURITY)
      >>> last_stub_mail_count = len(stub.test_emails)
 === modified file 'lib/lp/soyuz/doc/builder.txt'
 --- lib/lp/soyuz/doc/builder.txt	2009-08-27 19:09:44 +0000
 +++ lib/lp/soyuz/doc/builder.txt	2009-11-16 23:27:14 +0000
@@ -45,8 +45,10 @@
      >>> from lp.soyuz.interfaces.archive import ArchivePurpose
      >>> from zope.security.proxy import removeSecurityProxy
++    >>> from lp.soyuz.interfaces.build import IBuildSet
++    >>> build = getUtility(IBuildSet).getByQueueEntry(builder.currentjob)
      >>> builder_archive = removeSecurityProxy(
--    ...     builder.currentjob.build.archive)
++    ...     build.archive)
      >>> saved_purpose = builder_archive.purpose
      >>> builder_archive.purpose = ArchivePurpose.COPY
 === modified file 'lib/lp/soyuz/doc/buildqueue.txt'
 --- lib/lp/soyuz/doc/buildqueue.txt	2009-08-28 07:34:44 +0000
 +++ lib/lp/soyuz/doc/buildqueue.txt	2009-11-16 23:27:14 +0000
@@ -31,19 +31,21 @@
  The IBuild record related to this job is provided by the 'build'
  attribute:
--    >>> bq.build.id
++    >>> from lp.soyuz.interfaces.build import IBuildSet
++    >>> build = getUtility(IBuildSet).getByQueueEntry(bq)
++    >>> build.id
--    >>> bq.build.buildstate.name
++    >>> build.buildstate.name
      'BUILDING'
  The static timestamps, representing when the record was initialised
  (inserted) and when the job was dispatched are provided as datetime
  instances:
--    >>> bq.created
++    >>> bq.job.date_created
      datetime.datetime(2005, 6, 15, 9, 14, 12, 820778, tzinfo=<UTC>)
--    >>> bq.buildstart
++    >>> bq.date_started
      datetime.datetime(2005, 6, 15, 9, 20, 12, 820778, tzinfo=<UTC>)
  Check Builder foreign key, which indicated which builder 'is processing'
@@ -77,29 +79,6 @@
      >>> bq.manual
      False
--BuildQueue provides a property which calculates the partial duration
--of the build procedure (NOW - buildstart), it's mainly used in the UI.
--
--    >>> bq.buildduration
--    datetime.timedelta(...)
--
--Some local properties inherited from related content classes:
--
--    >>> bq.archseries.id == bq.build.distroarchseries.id
--    True
--    >>> bq.urgency == bq.build.sourcepackagerelease.urgency
--    True
--    >>> bq.archhintlist == bq.build.sourcepackagerelease.architecturehintlist
--    True
--    >>> bq.name == bq.build.sourcepackagerelease.name
--    True
--    >>> bq.version == bq.build.sourcepackagerelease.version
--    True
--    >>> bq.files.count() == bq.build.sourcepackagerelease.files.count()
--    True
--    >>> bq.builddependsindep == bq.build.sourcepackagerelease.builddependsindep
--    True
--
  BuildQueue provides the name for the logfile resulting from the build:
      >>> bq.getLogFileName()
@@ -131,11 +110,12 @@
      >>> print job.builder.name
      bob
--    >>> job.buildstart is not None
++    >>> job.date_started is not None
      True
      >>> print job.logtail
      Dummy sampledata entry, not processing
--    >>> print job.build.buildstate.name
++    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
++    >>> print build.buildstate.name
      BUILDING
      >>> print job.lastscore
@@ -150,11 +130,11 @@
      >>> print job.builder
      None
--    >>> print job.buildstart
++    >>> print job.date_started
      None
      >>> print job.logtail
      None
--    >>> print job.build.buildstate.name
++    >>> print build.buildstate.name
      NEEDSBUILD
      >>> print job.lastscore
@@ -169,9 +149,9 @@
      >>> print job.builder.name
      bob
--    >>> job.buildstart is not None
++    >>> job.date_started is not None
      True
--    >>> print job.build.buildstate.name
++    >>> print build.buildstate.name
      BUILDING
@@ -266,7 +246,7 @@
  and restricted
      >>> for bq in bqset.calculateCandidates(archseries):
--    ...     build = bq.build
++    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
      ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
      hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
      i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE (1000, 2)
@@ -298,7 +278,7 @@
  as intended.
      >>> for bq in bqset.calculateCandidates(archseries):
--    ...     build = bq.build
++    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
      ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
      hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
      i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE (1000, 2)
@@ -310,7 +290,7 @@
      >>> archseries = [hoary['hppa']]
      >>> for bq in bqset.calculateCandidates(archseries):
--    ...     build = bq.build
++    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
      ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
      hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
      hppa build of alsa-utils 1.0.9a-4 in ubuntu hoary RELEASE (500, 3)
 === modified file 'lib/lp/soyuz/doc/initialise-from-parent.txt'
 --- lib/lp/soyuz/doc/initialise-from-parent.txt	2009-10-26 18:40:04 +0000
 +++ lib/lp/soyuz/doc/initialise-from-parent.txt	2009-11-16 23:27:14 +0000
@@ -172,3 +172,10 @@
    >>> pmount_source.sourcepackagerelease.getBuildByArch(
    ...    foobuntu['hppa'], ubuntu.main_archive) is None
    True
++
++initialiseFromParent also copies the permitted source formats from the
++parent series.
++
++  >>> from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
++  >>> foobuntu.isSourcePackageFormatPermitted(SourcePackageFormat.FORMAT_1_0)
++  True
 === modified file 'lib/lp/soyuz/interfaces/build.py'
 --- lib/lp/soyuz/interfaces/build.py	2009-10-26 18:40:04 +0000
 +++ lib/lp/soyuz/interfaces/build.py	2009-11-16 23:27:14 +0000
@@ -524,6 +524,13 @@
          :rtype: ``dict``.
          """
++    def getByQueueEntry(queue_entry):
++        """Return an IBuild instance for the given build queue entry.
++
++        Retrieve the only one possible build record associated with the given
++        build queue entry. If not found, return None.
++        """
++
  class IBuildRescoreForm(Interface):
      """Form for rescoring a build."""
 === added file 'lib/lp/soyuz/interfaces/buildpackagejob.py'
 --- lib/lp/soyuz/interfaces/buildpackagejob.py	1970-01-01 00:00:00 +0000
 +++ lib/lp/soyuz/interfaces/buildpackagejob.py	2009-11-16 23:27:14 +0000
@@ -0,0 +1,34 @@
++# Copyright 2009 Canonical Ltd.  This software is licensed under the
++# GNU Affero General Public License version 3 (see the file LICENSE).
++
++# pylint: disable-msg=E0211,E0213
++
++"""BuildPackageJob interfaces."""
++
++__metaclass__ = type
++
++__all__ = [
++    'IBuildPackageJob',
++    ]
++
++from zope.schema import Int
++
++from canonical.launchpad import _
++from lazr.restful.fields import Reference
++from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
++from lp.services.job.interfaces.job import IJob
++from lp.soyuz.interfaces.build import IBuild
++
++
++class IBuildPackageJob(IBuildFarmJob):
++    """A read-only interface for build package jobs."""
++    id = Int(title=_('ID'), required=True, readonly=True)
++
++    job = Reference(
++        IJob, title=_("Job"), required=True, readonly=True,
++        description=_("Data common to all job types."))
++
++    build = Reference(
++        IBuild, title=_("Build"),
++        required=True,readonly=True,
++        description=_("Build record associated with this job."))
 === modified file 'lib/lp/soyuz/interfaces/buildqueue.py'
 --- lib/lp/soyuz/interfaces/buildqueue.py	2009-06-25 04:06:00 +0000
 +++ lib/lp/soyuz/interfaces/buildqueue.py	2009-11-16 23:27:14 +0000
@@ -13,6 +13,14 @@
+     ]
  from zope.interface import Interface, Attribute
++from zope.schema import Choice, Datetime
++
++from lazr.restful.fields import Reference
++
++from canonical.launchpad import _
++from lp.buildmaster.interfaces.buildfarmjob import (
++    IBuildFarmJob, BuildFarmJobType)
++from lp.services.job.interfaces.job import IJob
  class IBuildQueue(Interface):
@@ -30,59 +38,24 @@
      """
      id = Attribute("Job identifier")
--    build = Attribute("The IBuild record that originated this job")
      builder = Attribute("The IBuilder instance processing this job")
--    created = Attribute("The datetime that the queue entry was created")
--    buildstart = Attribute("The datetime of the last build attempt")
      logtail = Attribute("The current tail of the log of the build")
      lastscore = Attribute("Last score to be computed for this job")
      manual = Attribute("Whether or not the job was manually scored")
--    # properties inherited from related Content classes.
--    archseries = Attribute(
--        "DistroArchSeries target of the IBuild releated to this job.")
--    name = Attribute(
--        "Name of the ISourcePackageRelease releated to this job.")
--    version = Attribute(
--        "Version of the ISourcePackageRelease releated to this job.")
--    files = Attribute(
--        "Collection of files related to the ISourcePackageRelease "
--        "releated to this job.")
--    urgency = Attribute(
--        "Urgency of the ISourcePackageRelease releated to this job.")
--    archhintlist = Attribute(
--        "architecturehintlist of the ISourcePackageRelease releated "
--        "to this job.")
--    builddependsindep = Attribute(
--        "builddependsindep of the ISourcePackageRelease releated to "
--        "this job.")
--    buildduration = Attribute(
--        "Duration of the job, calculated on-the-fly based on buildstart.")
--    is_virtualized = Attribute("See IBuild.is_virtualized.")
++    job = Reference(
++        IJob, title=_("Job"), required=True, readonly=True,
++        description=_("Data common to all job types."))
++
++    job_type = Choice(
++        title=_('Job type'), required=True, vocabulary=BuildFarmJobType,
++        description=_("The type of this job."))
      def manualScore(value):
          """Manually set a score value to a queue item and lock it."""
      def score():
--        """Perform scoring based on heuristic values.
--
--        Creates a 'score' (priority) value based on:
--
--         * Component: main component gets higher values
--           (main, 1000, restricted, 750, universe, 250, multiverse, 0)
--
--         * Urgency: EMERGENCY sources gets higher values
--           (EMERGENCY, 20, HIGH, 15, MEDIUM, 10, LOW, 5)
--
--         * Queue time: old records gets a relative higher priority
--           (The rate against component is something like: a 'multiverse'
--           build will be as important as a 'main' after 40 hours in queue)
--
--        This method automatically updates IBuildQueue.lastscore value and
--        skips 'manually-scored' records.
--
--        This method use any logger available in the standard logging system.
--        """
++        """The job score calculated for the job type in question."""
      def destroySelf():
          """Delete this entry from the database."""
@@ -121,6 +94,17 @@
          Clean the builder for another jobs.
          """
++    specific_job = Reference(
++        IBuildFarmJob, title=_("Job"),
++        description=_("Data and operations common to all build farm jobs."))
++
++    def setDateStarted(timestamp):
++        """Sets the date started property to the given value."""
++
++    date_started = Datetime(
++        title=_('Start time'),
++        description=_('Time when the job started.'))
++
  class IBuildQueueSet(Interface):
      """Launchpad Auto Build queue set handler and auxiliary methods."""
@@ -165,4 +149,3 @@
          Retrieve the build queue and related builder rows associated with the
          builds in question where they exist.
          """
--
 === added file 'lib/lp/soyuz/interfaces/sourcepackageformat.py'
 --- lib/lp/soyuz/interfaces/sourcepackageformat.py	1970-01-01 00:00:00 +0000
 +++ lib/lp/soyuz/interfaces/sourcepackageformat.py	2009-11-16 23:27:14 +0000
@@ -0,0 +1,64 @@
++# Copyright 2009 Canonical Ltd.  This software is licensed under the
++# GNU Affero General Public License version 3 (see the file LICENSE).
++
++"""Source package format interfaces."""
++
++__metaclass__ = type
++
++__all__ = [
++    'SourcePackageFormat',
++    'ISourcePackageFormatSelection',
++    'ISourcePackageFormatSelectionSet',
++    ]
++
++from zope.interface import Attribute, Interface
++from lazr.enum import DBEnumeratedType, DBItem
++
++
++class SourcePackageFormat(DBEnumeratedType):
++    """Source package format
++
++    There are currently three formats of Debian source packages. The Format
++    field in the .dsc file must specify one of these formats.
++    """
++
++    FORMAT_1_0 = DBItem(0, """
++        1.0
++
++        Specifies either a native (having a single tar.gz) or non-native
++        (having an orig.tar.gz and a diff.gz) package. Supports only gzip
++        compression.
++        """)
++
++    FORMAT_3_0_QUILT = DBItem(1, """
++        3.0 (quilt)
++
++        Specifies a non-native package, with an orig.tar.* and a debian.tar.*.
++        Supports gzip and bzip2 compression.
++        """)
++
++    FORMAT_3_0_NATIVE = DBItem(2, """
++        3.0 (native)
++
++        Specifies a native package, with a single tar.*. Supports gzip and
++        bzip2 compression.
++        """)
++
++
++class ISourcePackageFormatSelection(Interface):
++    """A source package format allowed within a DistroSeries."""
++
++    id = Attribute("ID")
++    distroseries = Attribute("Target series")
++    format = Attribute("Permitted source package format")
++
++
++class ISourcePackageFormatSelectionSet(Interface):
++    """Set manipulation tools for the SourcePackageFormatSelection table."""
++
++    def getBySeriesAndFormat(distroseries, format):
++        """Return the ISourcePackageFormatSelection for the given series and
++        format."""
++
++    def add(distroseries, format):
++        """Allow the given source package format in the given series."""
 === modified file 'lib/lp/soyuz/model/build.py'
 --- lib/lp/soyuz/model/build.py	2009-10-26 18:40:04 +0000
 +++ lib/lp/soyuz/model/build.py	2009-11-16 23:27:14 +0000
@@ -18,7 +18,6 @@
  from zope.security.proxy import removeSecurityProxy
  from storm.expr import (
      Desc, In, Join, LeftJoin)
--from storm.references import Reference
  from storm.store import Store
  from sqlobject import (
      StringCol, ForeignKey, IntervalCol, SQLObjectNotFound)
@@ -46,7 +45,9 @@
      IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
  from canonical.launchpad.webapp.tales import DurationFormatterAPI
  from lp.archivepublisher.utils import get_ppa_reference
++from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
  from lp.registry.interfaces.pocket import PackagePublishingPocket
++from lp.services.job.model.job import Job
  from lp.soyuz.adapters.archivedependencies import get_components_for_building
  from lp.soyuz.interfaces.archive import ArchivePurpose
  from lp.soyuz.interfaces.build import (
@@ -55,6 +56,7 @@
  from lp.soyuz.interfaces.publishing import active_publishing_status
  from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
  from lp.soyuz.model.builder import Builder
++from lp.soyuz.model.buildpackagejob import BuildPackageJob
  from lp.soyuz.model.buildqueue import BuildQueue
  from lp.soyuz.model.files import BinaryPackageFile
  from lp.soyuz.model.publishing import SourcePackagePublishingHistory
@@ -88,8 +90,6 @@
      archive = ForeignKey(foreignKey='Archive', dbName='archive', notNull=True)
      estimated_build_duration = IntervalCol(default=None)
--    buildqueue_record = Reference("<primary key>", BuildQueue.buildID,
--                                  on_remote=True)
      date_first_dispatched = UtcDateTimeCol(dbName='date_first_dispatched')
      upload_log = ForeignKey(
@@ -105,6 +105,16 @@
          return proxied_file.http_url
      @property
++    def buildqueue_record(self):
++        """See `IBuild`."""
++        store = Store.of(self)
++        results = store.find(
++            BuildQueue,
++            BuildPackageJob.job == BuildQueue.jobID,
++            BuildPackageJob.build == self.id)
++        return results.one()
++
++    @property
      def upload_log_url(self):
          """See `IBuild`."""
          if self.upload_log is None:
@@ -351,8 +361,10 @@
                  Archive
                  JOIN Build ON
                      Build.archive = Archive.id
++                JOIN BuildPackageJob ON
++                    Build.id = BuildPackageJob.build
                  JOIN BuildQueue ON
--                    Build.id = BuildQueue.build
++                    BuildPackageJob.job = BuildQueue.job
              WHERE
                  Build.buildstate = 0 AND
                  Build.processor = %s AND
@@ -412,16 +424,20 @@
              SELECT
                  CAST (EXTRACT(EPOCH FROM
                          (Build.estimated_build_duration -
--                        (NOW() - BuildQueue.buildstart))) AS INTEGER)
++                        (NOW() - Job.date_started))) AS INTEGER)
                      AS remainder
              FROM
                  Archive
                  JOIN Build ON
                      Build.archive = Archive.id
++                JOIN BuildPackageJob ON
++                    Build.id = BuildPackageJob.build
                  JOIN BuildQueue ON
--                    Build.id = BuildQueue.build
++                    BuildQueue.job = BuildPackageJob.job
                  JOIN Builder ON
                      Builder.id = BuildQueue.builder
++                JOIN Job ON
++                    Job.id = BuildPackageJob.job
              WHERE
                  Archive.require_virtualized = %s AND
                  Archive.enabled = TRUE AND
@@ -605,7 +621,18 @@
      def createBuildQueueEntry(self):
          """See `IBuild`"""
--        return BuildQueue(build=self)
++        store = Store.of(self)
++        job = Job()
++        store.add(job)
++        specific_job = BuildPackageJob()
++        specific_job.build = self.id
++        specific_job.job = job.id
++        store.add(specific_job)
++        queue_entry = BuildQueue()
++        queue_entry.job = job.id
++        queue_entry.job_type = BuildFarmJobType.PACKAGEBUILD
++        store.add(queue_entry)
++        return queue_entry
      def notify(self, extra_info=None):
          """See `IBuild`"""
@@ -966,7 +993,9 @@
          if status in [BuildStatus.NEEDSBUILD, BuildStatus.BUILDING]:
              orderBy = ["-BuildQueue.lastscore", "Build.id"]
              clauseTables.append('BuildQueue')
--            condition_clauses.append('BuildQueue.build = Build.id')
++            clauseTables.append('BuildPackageJob')
++            condition_clauses.append('BuildPackageJob.build = Build.id')
++            condition_clauses.append('BuildPackageJob.job = BuildQueue.job')
          elif status == BuildStatus.SUPERSEDED or status is None:
              orderBy = ["-Build.datecreated"]
          else:
@@ -1144,3 +1173,13 @@
          # this (pre_iter_hook()) method that will iterate over the
          # result set and force the query execution that way.
          return list(result_set)
++
++    def getByQueueEntry(self, queue_entry):
++        """See `IBuildSet`."""
++        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
++        result_set = store.find(
++            Build,
++            BuildPackageJob.build == Build.id,
++            BuildPackageJob.job == queue_entry.job)
++
++        return result_set.one()
 === modified file 'lib/lp/soyuz/model/builder.py'
 --- lib/lp/soyuz/model/builder.py	2009-11-11 10:43:07 +0000
 +++ lib/lp/soyuz/model/builder.py	2009-11-16 23:27:14 +0000
@@ -52,6 +52,7 @@
  from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
  from lp.soyuz.interfaces.publishing import (
      PackagePublishingStatus)
++from lp.soyuz.model.buildpackagejob import BuildPackageJob
  from canonical.launchpad.webapp import urlappend
  from canonical.librarian.utils import copy_and_close
@@ -151,11 +152,11 @@
          # Avoid circular imports.
          from lp.soyuz.model.publishing import makePoolPath
--        build = build_queue_item.build
++        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
          archive = build.archive
          archive_url = archive.archive_url
          component_name = build.current_component.name
--        for source_file in build_queue_item.files:
++        for source_file in build.sourcepackagerelease.files:
              file_name = source_file.libraryfile.filename
              sha1 = source_file.libraryfile.content.sha1
              source_name = build.sourcepackagerelease.sourcepackagename.name
@@ -264,8 +265,8 @@
           * Ensure that the build pocket allows builds for the current
             distroseries state.
          """
--        assert not (not self.virtualized and
--                    build_queue_item.is_virtualized), (
++        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
++        assert not (not self.virtualized and build.is_virtualized), (
              "Attempt to build non-virtual item on a virtual builder.")
          # Assert that we are not silently building SECURITY jobs.
@@ -274,27 +275,27 @@
          # XXX Julian 2007-12-18 spec=security-in-soyuz: This is being
          # addressed in the work on the blueprint:
          # https://blueprints.launchpad.net/soyuz/+spec/security-in-soyuz
--        target_pocket = build_queue_item.build.pocket
++        target_pocket = build.pocket
          assert target_pocket != PackagePublishingPocket.SECURITY, (
              "Soyuz is not yet capable of building SECURITY uploads.")
          # Ensure build has the needed chroot
--        chroot = build_queue_item.archseries.getChroot()
++        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
++        chroot = build.distroarchseries.getChroot()
          if chroot is None:
              raise CannotBuild(
                  "Missing CHROOT for %s/%s/%s" % (
--                    build_queue_item.build.distroseries.distribution.name,
--                    build_queue_item.build.distroseries.name,
--                    build_queue_item.build.distroarchseries.architecturetag)
++                    build.distroseries.distribution.name,
++                    build.distroseries.name,
++                    build.distroarchseries.architecturetag)
+                 )
          # The main distribution has policies to prevent uploads to some
          # pockets (e.g. security) during different parts of the distribution
          # series lifecycle. These do not apply to PPA builds nor any archive
          # that allows release pocket updates.
--        if (build_queue_item.build.archive.purpose != ArchivePurpose.PPA and
--            not build_queue_item.build.archive.allowUpdatesToReleasePocket()):
--            build = build_queue_item.build
++        if (build.archive.purpose != ArchivePurpose.PPA and
++            not build.archive.allowUpdatesToReleasePocket()):
              # XXX Robert Collins 2007-05-26: not an explicit CannotBuild
              # exception yet because the callers have not been audited
              assert build.distroseries.canUploadToPocket(build.pocket), (
@@ -306,7 +307,8 @@
      def _dispatchBuildToSlave(self, build_queue_item, args, buildid, logger):
          """Start the build on the slave builder."""
          # Send chroot.
--        chroot = build_queue_item.archseries.getChroot()
++        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
++        chroot = build.distroarchseries.getChroot()
          self.cacheFileOnSlave(logger, chroot)
          # Build filemap structure with the files required in this build
@@ -314,11 +316,11 @@
          # If the build is private we tell the slave to get the files from the
          # archive instead of the librarian because the slaves cannot
          # access the restricted librarian.
--        private = build_queue_item.build.archive.private
++        private = build.archive.private
          if private:
              self.cachePrivateSourceOnSlave(logger, build_queue_item)
          filemap = {}
--        for source_file in build_queue_item.files:
++        for source_file in build.sourcepackagerelease.files:
              lfa = source_file.libraryfile
              filemap[lfa.filename] = lfa.content.sha1
              if not private:
@@ -349,9 +351,10 @@
      def startBuild(self, build_queue_item, logger):
          """See IBuilder."""
++        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
++        spr = build.sourcepackagerelease
          logger.info("startBuild(%s, %s, %s, %s)", self.url,
--                    build_queue_item.name, build_queue_item.version,
--                    build_queue_item.build.pocket.title)
++                    spr.name, spr.version, build.pocket.title)
          # Make sure the request is valid; an exception is raised if it's not.
          self._verifyBuildRequest(build_queue_item, logger)
@@ -365,39 +368,39 @@
          # turn 'arch_indep' ON only if build is archindep or if
          # the specific architecture is the nominatedarchindep for
          # this distroseries (in case it requires any archindep source)
--        args['arch_indep'] = build_queue_item.archseries.isNominatedArchIndep
++        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
++        args['arch_indep'] = build.distroarchseries.isNominatedArchIndep
--        suite = build_queue_item.build.distroarchseries.distroseries.name
--        if build_queue_item.build.pocket != PackagePublishingPocket.RELEASE:
--            suite += "-%s" % (build_queue_item.build.pocket.name.lower())
++        suite = build.distroarchseries.distroseries.name
++        if build.pocket != PackagePublishingPocket.RELEASE:
++            suite += "-%s" % (build.pocket.name.lower())
          args['suite'] = suite
--        archive_purpose = build_queue_item.build.archive.purpose
++        archive_purpose = build.archive.purpose
          if (archive_purpose == ArchivePurpose.PPA and
--            not build_queue_item.build.archive.require_virtualized):
++            not build.archive.require_virtualized):
              # If we're building a non-virtual PPA, override the purpose
              # to PRIMARY and use the primary component override.
              # This ensures that the package mangling tools will run over
              # the built packages.
              args['archive_purpose'] = ArchivePurpose.PRIMARY.name
              args["ogrecomponent"] = (
--                get_primary_current_component(build_queue_item.build))
++                get_primary_current_component(build))
          else:
              args['archive_purpose'] = archive_purpose.name
              args["ogrecomponent"] = (
--                build_queue_item.build.current_component.name)
++                build.current_component.name)
--        args['archives'] = get_sources_list_for_building(
--            build_queue_item.build)
++        args['archives'] = get_sources_list_for_building(build)
          # Let the build slave know whether this is a build in a private
          # archive.
--        args['archive_private'] = build_queue_item.build.archive.private
++        args['archive_private'] = build.archive.private
          # Generate a string which can be used to cross-check when obtaining
          # results so we know we are referring to the right database object in
          # subsequent runs.
--        buildid = "%s-%s" % (build_queue_item.build.id, build_queue_item.id)
++        buildid = "%s-%s" % (build.id, build_queue_item.id)
          logger.debug("Initiating build %s on %s" % (buildid, self.url))
          # Do it.
@@ -421,8 +424,9 @@
          if currentjob is None:
              return 'Idle'
--        msg = 'Building %s' % currentjob.build.title
--        archive = currentjob.build.archive
++        build = getUtility(IBuildSet).getByQueueEntry(currentjob)
++        msg = 'Building %s' % build.title
++        archive = build.archive
          if not archive.owner.private and (archive.is_ppa or archive.is_copy):
              return '%s [%s/%s]' % (msg, archive.owner.name, archive.name)
          else:
@@ -553,7 +557,8 @@
                        SourcePackagePublishingHistory.status IN %s))
                OR
                archive.private IS FALSE) AND
--            buildqueue.build = build.id AND
++            buildqueue.job = buildpackagejob.job AND
++            buildpackagejob.build = build.id AND
              build.distroarchseries = distroarchseries.id AND
              build.archive = archive.id AND
              archive.enabled = TRUE AND
@@ -563,7 +568,8 @@
          """ % sqlvalues(
              private_statuses, BuildStatus.NEEDSBUILD, self.processor.family)]
--        clauseTables = ['Build', 'DistroArchSeries', 'Archive']
++        clauseTables = [
++            'Build', 'BuildPackageJob', 'DistroArchSeries', 'Archive']
          clauses.append("""
              archive.require_virtualized = %s
@@ -605,7 +611,7 @@
          query = " AND ".join(clauses)
          candidate = BuildQueue.selectFirst(
--            query, clauseTables=clauseTables, prejoins=['build'],
++            query, clauseTables=clauseTables,
              orderBy=['-buildqueue.lastscore', 'build.id'])
          return candidate
@@ -629,26 +635,28 @@
          # Builds in those situation should not be built because they will
          # be wasting build-time, the former case already has a newer source
          # and the latter could not be built in DAK.
++        build_set = getUtility(IBuildSet)
          while candidate is not None:
--            if candidate.build.pocket == PackagePublishingPocket.SECURITY:
++            build = build_set.getByQueueEntry(candidate)
++            if build.pocket == PackagePublishingPocket.SECURITY:
                  # We never build anything in the security pocket.
                  logger.debug(
                      "Build %s FAILEDTOBUILD, queue item %s REMOVED"
--                    % (candidate.build.id, candidate.id))
--                candidate.build.buildstate = BuildStatus.FAILEDTOBUILD
++                    % (build.id, candidate.id))
++                build.buildstate = BuildStatus.FAILEDTOBUILD
                  candidate.destroySelf()
                  candidate = self._findBuildCandidate()
                  continue
--            publication = candidate.build.current_source_publication
++            publication = build.current_source_publication
              if publication is None:
                  # The build should be superseded if it no longer has a
                  # current publishing record.
                  logger.debug(
                      "Build %s SUPERSEDED, queue item %s REMOVED"
--                    % (candidate.build.id, candidate.id))
--                candidate.build.buildstate = BuildStatus.SUPERSEDED
++                    % (build.id, candidate.id))
++                build.buildstate = BuildStatus.SUPERSEDED
                  candidate.destroySelf()
                  candidate = self._findBuildCandidate()
                  continue
@@ -751,13 +759,15 @@
          origin = (
              Archive,
              Build,
++            BuildPackageJob,
              BuildQueue,
              DistroArchSeries,
              Processor,
+             )
          queue = store.using(*origin).find(
              BuildQueue,
--            BuildQueue.build == Build.id,
++            BuildPackageJob.job == BuildQueue.jobID,
++            BuildPackageJob.build == Build.id,
              Build.distroarchseries == DistroArchSeries.id,
              Build.archive == Archive.id,
              DistroArchSeries.processorfamilyID == Processor.familyID,
 === added file 'lib/lp/soyuz/model/buildpackagejob.py'
 --- lib/lp/soyuz/model/buildpackagejob.py	1970-01-01 00:00:00 +0000
 +++ lib/lp/soyuz/model/buildpackagejob.py	2009-11-16 23:27:14 +0000
@@ -0,0 +1,168 @@
++# Copyright 2009 Canonical Ltd.  This software is licensed under the
++# GNU Affero General Public License version 3 (see the file LICENSE).
++
++__metaclass__ = type
++__all__ = ['BuildPackageJob']
++
++
++from datetime import datetime
++import pytz
++
++from storm.locals import Int, Reference, Storm
++
++from zope.interface import implements
++
++from canonical.database.constants import UTC_NOW
++from canonical.launchpad.interfaces import SourcePackageUrgency
++from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
++from lp.registry.interfaces.pocket import PackagePublishingPocket
++from lp.soyuz.interfaces.archive import ArchivePurpose
++from lp.soyuz.interfaces.build import BuildStatus
++from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
++
++
++class BuildPackageJob(Storm):
++    """See `IBuildPackageJob`."""
++    implements(IBuildFarmJob, IBuildPackageJob)
++    __storm_table__ = 'buildpackagejob'
++    id = Int(primary=True)
++
++    job_id = Int(name='job', allow_none=False)
++    job = Reference(job_id, 'Job.id')
++
++    build_id = Int(name='build', allow_none=False)
++    build = Reference(build_id, 'Build.id')
++
++    def score(self):
++        """See `IBuildPackageJob`."""
++        score_pocketname = {
++            PackagePublishingPocket.BACKPORTS: 0,
++            PackagePublishingPocket.RELEASE: 1500,
++            PackagePublishingPocket.PROPOSED: 3000,
++            PackagePublishingPocket.UPDATES: 3000,
++            PackagePublishingPocket.SECURITY: 4500,
++            }
++
++        score_componentname = {
++            'multiverse': 0,
++            'universe': 250,
++            'restricted': 750,
++            'main': 1000,
++            'partner' : 1250,
++            }
++
++        score_urgency = {
++            SourcePackageUrgency.LOW: 5,
++            SourcePackageUrgency.MEDIUM: 10,
++            SourcePackageUrgency.HIGH: 15,
++            SourcePackageUrgency.EMERGENCY: 20,
++            }
++
++        # Define a table we'll use to calculate the score based on the time
++        # in the build queue.  The table is a sorted list of (upper time
++        # limit in seconds, score) tuples.
++        queue_time_scores = [
++            (14400, 100),
++            (7200, 50),
++            (3600, 20),
++            (1800, 15),
++            (900, 10),
++            (300, 5),
++        ]
++
++        private_archive_increment = 10000
++
++        # For build jobs in rebuild archives a score value of -1
++        # was chosen because their priority is lower than build retries
++        # or language-packs. They should be built only when there is
++        # nothing else to build.
++        rebuild_archive_score = -10
++
++        score = 0
++
++        # Please note: the score for language packs is to be zero because
++        # they unduly delay the building of packages in the main component
++        # otherwise.
++        if self.build.sourcepackagerelease.section.name == 'translations':
++            pass
++        elif self.build.archive.purpose == ArchivePurpose.COPY:
++            score = rebuild_archive_score
++        else:
++            # Calculates the urgency-related part of the score.
++            urgency = score_urgency[self.build.sourcepackagerelease.urgency]
++            score += urgency
++
++            # Calculates the pocket-related part of the score.
++            score_pocket = score_pocketname[self.build.pocket]
++            score += score_pocket
++
++            # Calculates the component-related part of the score.
++            score_component = score_componentname[
++                self.build.current_component.name]
++            score += score_component
++
++            # Calculates the build queue time component of the score.
++            right_now = datetime.now(pytz.timezone('UTC'))
++            eta = right_now - self.job.date_created
++            for limit, dep_score in queue_time_scores:
++                if eta.seconds > limit:
++                    score += dep_score
++                    break
++
++            # Private builds get uber score.
++            if self.build.archive.private:
++                score += private_archive_increment
++
++            # Lastly, apply the archive score delta.  This is to boost
++            # or retard build scores for any build in a particular
++            # archive.
++            score += self.build.archive.relative_build_score
++
++        return score
++
++    def getLogFileName(self):
++        """See `IBuildPackageJob`."""
++        sourcename = self.build.sourcepackagerelease.name
++        version = self.build.sourcepackagerelease.version
++        # we rely on previous storage of current buildstate
++        # in the state handling methods.
++        state = self.build.buildstate.name
++
++        dar = self.build.distroarchseries
++        distroname = dar.distroseries.distribution.name
++        distroseriesname = dar.distroseries.name
++        archname = dar.architecturetag
++
++        # logfilename format:
++        # buildlog_<DISTRIBUTION>_<DISTROSeries>_<ARCHITECTURE>_\
++        # <SOURCENAME>_<SOURCEVERSION>_<BUILDSTATE>.txt
++        # as:
++        # buildlog_ubuntu_dapper_i386_foo_1.0-ubuntu0_FULLYBUILT.txt
++        # it fix request from bug # 30617
++        return ('buildlog_%s-%s-%s.%s_%s_%s.txt' % (
++            distroname, distroseriesname, archname, sourcename, version, state
++            ))
++
++    def getName(self):
++        """See `IBuildPackageJob`."""
++        return self.build.sourcepackagerelease.name
++
++    def jobStarted(self):
++        """See `IBuildPackageJob`."""
++        self.build.buildstate = BuildStatus.BUILDING
++        # The build started, set the start time if not set already.
++        if self.build.date_first_dispatched is None:
++            self.build.date_first_dispatched = UTC_NOW
++
++    def jobReset(self):
++        """See `IBuildPackageJob`."""
++        self.build.buildstate = BuildStatus.NEEDSBUILD
++
++    def jobAborted(self):
++        """See `IBuildPackageJob`."""
++        # XXX, al-maisan, Thu, 12 Nov 2009 16:38:52 +0100
++        # The setting below was "inherited" from the previous code. We
++        # need to investigate whether and why this is really needed and
++        # fix it.
++        self.build.buildstate = BuildStatus.BUILDING
++
 === modified file 'lib/lp/soyuz/model/buildqueue.py'
 --- lib/lp/soyuz/model/buildqueue.py	2009-08-28 06:39:38 +0000
 +++ lib/lp/soyuz/model/buildqueue.py	2009-11-16 23:27:14 +0000
@@ -10,27 +10,25 @@
      'BuildQueueSet'
+     ]
--from datetime import datetime
  import logging
--import pytz
  from zope.component import getUtility
  from zope.interface import implements
  from sqlobject import (
      StringCol, ForeignKey, BoolCol, IntCol, SQLObjectNotFound)
--from storm.expr import In, LeftJoin
++from storm.expr import In, Join, LeftJoin
  from canonical import encoding
--from canonical.database.constants import UTC_NOW
--from canonical.database.datetimecol import UtcDateTimeCol
++from canonical.database.enumcol import EnumCol
  from canonical.database.sqlbase import SQLBase, sqlvalues
  from canonical.launchpad.webapp.interfaces import NotFoundError
--from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
--from lp.soyuz.interfaces.archive import ArchivePurpose
--from lp.soyuz.interfaces.build import BuildStatus
++from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
++from lp.services.job.interfaces.job import JobStatus
++from lp.services.job.model.job import Job
++from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
  from lp.soyuz.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
--from lp.registry.interfaces.pocket import PackagePublishingPocket
++from lp.soyuz.model.buildpackagejob import BuildPackageJob
  from canonical.launchpad.webapp.interfaces import (
      IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
@@ -40,229 +38,85 @@
      _table = "BuildQueue"
      _defaultOrder = "id"
--    build = ForeignKey(dbName='build', foreignKey='Build', notNull=True)
++    job = ForeignKey(dbName='job', foreignKey='Job', notNull=True)
++    job_type = EnumCol(
++        enum=BuildFarmJobType, notNull=True,
++        default=BuildFarmJobType.PACKAGEBUILD, dbName='job_type')
      builder = ForeignKey(dbName='builder', foreignKey='Builder', default=None)
--    created = UtcDateTimeCol(dbName='created', default=UTC_NOW)
--    buildstart = UtcDateTimeCol(dbName='buildstart', default= None)
      logtail = StringCol(dbName='logtail', default=None)
      lastscore = IntCol(dbName='lastscore', default=0)
      manual = BoolCol(dbName='manual', default=False)
++    @property
++    def specific_job(self):
++        """See `IBuildQueue`."""
++        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
++        result_set = store.find(
++            BuildPackageJob, BuildPackageJob.job == self.job)
++        return result_set.one()
++
++    @property
++    def date_started(self):
++        """See `IBuildQueue`."""
++        return self.job.date_started
++
      def manualScore(self, value):
          """See `IBuildQueue`."""
          self.lastscore = value
          self.manual = True
--    @property
--    def archseries(self):
--        """See `IBuildQueue`."""
--        return self.build.distroarchseries
--
--    @property
--    def urgency(self):
--        """See `IBuildQueue`."""
--        return self.build.sourcepackagerelease.urgency
--
--    @property
--    def archhintlist(self):
--        """See `IBuildQueue`."""
--        return self.build.sourcepackagerelease.architecturehintlist
--
--    @property
--    def name(self):
--        """See `IBuildQueue`."""
--        return self.build.sourcepackagerelease.name
--
--    @property
--    def version(self):
--        """See `IBuildQueue`."""
--        return self.build.sourcepackagerelease.version
--
--    @property
--    def files(self):
--        """See `IBuildQueue`."""
--        return self.build.sourcepackagerelease.files
--
--    @property
--    def builddependsindep(self):
--        """See `IBuildQueue`."""
--        return self.build.sourcepackagerelease.builddependsindep
--
--    @property
--    def buildduration(self):
--        """See `IBuildQueue`."""
--        if self.buildstart:
--            UTC = pytz.timezone('UTC')
--            now = datetime.now(UTC)
--            return now - self.buildstart
--        return None
--
--    @property
--    def is_virtualized(self):
--        """See `IBuildQueue`."""
--        return self.build.is_virtualized
--
      def score(self):
          """See `IBuildQueue`."""
          # Grab any logger instance available.
          logger = logging.getLogger()
++        name = self.specific_job.getName()
          if self.manual:
              logger.debug(
--                "%s (%d) MANUALLY RESCORED" % (self.name, self.lastscore))
++                "%s (%d) MANUALLY RESCORED" % (name, self.lastscore))
              return
--        # XXX Al-maisan, 2008-05-14 (bug #230330):
--        # We keep touching the code here whenever a modification to the
--        # scoring parameters/weights is needed. Maybe the latter can be
--        # externalized?
--
--        score_pocketname = {
--            PackagePublishingPocket.BACKPORTS: 0,
--            PackagePublishingPocket.RELEASE: 1500,
--            PackagePublishingPocket.PROPOSED: 3000,
--            PackagePublishingPocket.UPDATES: 3000,
--            PackagePublishingPocket.SECURITY: 4500,
--            }
--
--        score_componentname = {
--            'multiverse': 0,
--            'universe': 250,
--            'restricted': 750,
--            'main': 1000,
--            'partner' : 1250,
--            }
--
--        score_urgency = {
--            SourcePackageUrgency.LOW: 5,
--            SourcePackageUrgency.MEDIUM: 10,
--            SourcePackageUrgency.HIGH: 15,
--            SourcePackageUrgency.EMERGENCY: 20,
--            }
--
--        # Define a table we'll use to calculate the score based on the time
--        # in the build queue.  The table is a sorted list of (upper time
--        # limit in seconds, score) tuples.
--        queue_time_scores = [
--            (14400, 100),
--            (7200, 50),
--            (3600, 20),
--            (1800, 15),
--            (900, 10),
--            (300, 5),
--        ]
--
--        private_archive_increment = 10000
--
--        # For build jobs in rebuild archives a score value of -1
--        # was chosen because their priority is lower than build retries
--        # or language-packs. They should be built only when there is
--        # nothing else to build.
--        rebuild_archive_score = -10
--
--        score = 0
--        msg = "%s (%d) -> " % (self.build.title, self.lastscore)
--
--        # Please note: the score for language packs is to be zero because
--        # they unduly delay the building of packages in the main component
--        # otherwise.
--        if self.build.sourcepackagerelease.section.name == 'translations':
--            msg += "LPack => score zero"
--        elif self.build.archive.purpose == ArchivePurpose.COPY:
--            score = rebuild_archive_score
--            msg += "Rebuild archive => -10"
--        else:
--            # Calculates the urgency-related part of the score.
--            urgency = score_urgency[self.urgency]
--            score += urgency
--            msg += "U+%d " % urgency
--
--            # Calculates the pocket-related part of the score.
--            score_pocket = score_pocketname[self.build.pocket]
--            score += score_pocket
--            msg += "P+%d " % score_pocket
--
--            # Calculates the component-related part of the score.
--            score_component = score_componentname[
--                self.build.current_component.name]
--            score += score_component
--            msg += "C+%d " % score_component
--
--            # Calculates the build queue time component of the score.
--            right_now = datetime.now(pytz.timezone('UTC'))
--            eta = right_now - self.created
--            for limit, dep_score in queue_time_scores:
--                if eta.seconds > limit:
--                    score += dep_score
--                    msg += "T+%d " % dep_score
--                    break
--            else:
--                msg += "T+0 "
--
--            # Private builds get uber score.
--            if self.build.archive.private:
--                score += private_archive_increment
--
--            # Lastly, apply the archive score delta.  This is to boost
--            # or retard build scores for any build in a particular
--            # archive.
--            score += self.build.archive.relative_build_score
--
--        # Store current score value.
--        self.lastscore = score
--
--        logger.debug("%s= %d" % (msg, self.lastscore))
++        # Allow the `IBuildFarmJob` instance with the data/logic specific to
++        # the job at hand to calculate the score as appropriate.
++        self.lastscore = self.specific_job.score()
      def getLogFileName(self):
          """See `IBuildQueue`."""
--        sourcename = self.build.sourcepackagerelease.name
--        version = self.build.sourcepackagerelease.version
--        # we rely on previous storage of current buildstate
--        # in the state handling methods.
--        state = self.build.buildstate.name
--
--        dar = self.build.distroarchseries
--        distroname = dar.distroseries.distribution.name
--        distroseriesname = dar.distroseries.name
--        archname = dar.architecturetag
--
--        # logfilename format:
--        # buildlog_<DISTRIBUTION>_<DISTROSeries>_<ARCHITECTURE>_\
--        # <SOURCENAME>_<SOURCEVERSION>_<BUILDSTATE>.txt
--        # as:
--        # buildlog_ubuntu_dapper_i386_foo_1.0-ubuntu0_FULLYBUILT.txt
--        # it fix request from bug # 30617
--        return ('buildlog_%s-%s-%s.%s_%s_%s.txt' % (
--            distroname, distroseriesname, archname, sourcename, version, state
--            ))
++        # Allow the `IBuildFarmJob` instance with the data/logic specific to
++        # the job at hand to calculate the log file name as appropriate.
++        return self.specific_job.getLogFileName()
      def markAsBuilding(self, builder):
          """See `IBuildQueue`."""
          self.builder = builder
--        self.buildstart = UTC_NOW
--        self.build.buildstate = BuildStatus.BUILDING
--        # The build started, set the start time if not set already.
--        if self.build.date_first_dispatched is None:
--            self.build.date_first_dispatched = UTC_NOW
++        if self.job.status != JobStatus.RUNNING:
++            self.job.start()
++        self.specific_job.jobStarted()
      def reset(self):
          """See `IBuildQueue`."""
          self.builder = None
--        self.buildstart = None
++        if self.job.status != JobStatus.WAITING:
++            self.job.queue()
++        self.job.date_started = None
++        self.job.date_finished = None
          self.logtail = None
--        self.build.buildstate = BuildStatus.NEEDSBUILD
++        self.specific_job.jobReset()
      def updateBuild_IDLE(self, build_id, build_status, logtail,
                           filemap, dependencies, logger):
          """See `IBuildQueue`."""
++        build = getUtility(IBuildSet).getByQueueEntry(self)
          logger.warn(
              "Builder %s forgot about build %s -- resetting buildqueue record"
--            % (self.builder.url, self.build.title))
++            % (self.builder.url, build.title))
          self.reset()
      def updateBuild_BUILDING(self, build_id, build_status,
                               logtail, filemap, dependencies, logger):
          """See `IBuildQueue`."""
++        if self.job.status != JobStatus.RUNNING:
++            self.job.start()
          self.logtail = encoding.guess(str(logtail))
      def updateBuild_ABORTING(self, buildid, build_status,
@@ -275,8 +129,15 @@
          """See `IBuildQueue`."""
          self.builder.cleanSlave()
          self.builder = None
--        self.buildstart = None
--        self.build.buildstate = BuildStatus.BUILDING
++        if self.job.status != JobStatus.FAILED:
++            self.job.fail()
++        self.job.date_started = None
++        self.job.date_finished = None
++        self.specific_job.jobAborted()
++
++    def setDateStarted(self, timestamp):
++        """See `IBuildQueue`."""
++        self.job.date_started = timestamp
  class BuildQueueSet(object):
@@ -311,7 +172,12 @@
      def getActiveBuildJobs(self):
          """See `IBuildQueueSet`."""
--        return BuildQueue.select('buildstart is not null')
++        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
++        result_set = store.find(
++            BuildQueue,
++            BuildQueue.job == Job.id,
++            Job.date_started != None)
++        return result_set
      def calculateCandidates(self, archseries):
          """See `IBuildQueueSet`."""
@@ -323,30 +189,37 @@
          query = """
             Build.distroarchseries IN %s AND
             Build.buildstate = %s AND
--           BuildQueue.build = build.id AND
++           BuildQueue.job_type = %s AND
++           BuildQueue.job = BuildPackageJob.job AND
++           BuildPackageJob.build = build.id AND
             BuildQueue.builder IS NULL
--        """ % sqlvalues(arch_ids, BuildStatus.NEEDSBUILD)
++        """ % sqlvalues(
++            arch_ids, BuildStatus.NEEDSBUILD, BuildFarmJobType.PACKAGEBUILD)
          candidates = BuildQueue.select(
--            query, clauseTables=['Build'], orderBy=['-BuildQueue.lastscore'])
++            query, clauseTables=['Build', 'BuildPackageJob'],
++            orderBy=['-BuildQueue.lastscore'])
          return candidates
      def getForBuilds(self, build_ids):
          """See `IBuildQueueSet`."""
          # Avoid circular import problem.
++        from lp.soyuz.model.build import Build
          from lp.soyuz.model.builder import Builder
          store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
          origin = (
--            BuildQueue,
++            BuildPackageJob,
++            Join(BuildQueue, BuildPackageJob.job == BuildQueue.jobID),
++            Join(Build, BuildPackageJob.build == Build.id),
              LeftJoin(
                  Builder,
                  BuildQueue.builderID == Builder.id),
+             )
          result_set = store.using(*origin).find(
--            (BuildQueue, Builder),
--            In(BuildQueue.buildID, build_ids))
++            (BuildQueue, Builder, BuildPackageJob),
++            In(Build.id, build_ids))
          return result_set
 === modified file 'lib/lp/soyuz/model/queue.py'
 --- lib/lp/soyuz/model/queue.py	2009-10-26 11:51:40 +0000
 +++ lib/lp/soyuz/model/queue.py	2009-11-16 23:27:14 +0000
@@ -1468,7 +1468,8 @@
              published_sha1 = published_file.content.sha1
              # Multiple orig(s) with the same content are fine.
--            if source_file.filetype == SourcePackageFileType.ORIG:
++            if source_file.filetype == (
++                SourcePackageFileType.ORIG_TARBALL):
                  if proposed_sha1 == published_sha1:
                      continue
                  raise QueueInconsistentStateError(
 === added file 'lib/lp/soyuz/model/sourcepackageformat.py'
 --- lib/lp/soyuz/model/sourcepackageformat.py	1970-01-01 00:00:00 +0000
 +++ lib/lp/soyuz/model/sourcepackageformat.py	2009-11-16 23:27:14 +0000
@@ -0,0 +1,56 @@
++# Copyright 2009 Canonical Ltd.  This software is licensed under the
++# GNU Affero General Public License version 3 (see the file LICENSE).
++
++__metaclass__ = type
++
++__all__ = [
++    'SourcePackageFormatSelection',
++    'SourcePackageFormatSelectionSet',
++    ]
++
++from storm.locals import Storm, Int, Reference
++from zope.component import getUtility
++from zope.interface import implements
++
++from canonical.launchpad.webapp.interfaces import (
++    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR, MASTER_FLAVOR)
++from canonical.database.enumcol import DBEnum
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelection, ISourcePackageFormatSelectionSet,
++    SourcePackageFormat)
++
++
++class SourcePackageFormatSelection(Storm):
++    """See ISourcePackageFormatSelection."""
++
++    implements(ISourcePackageFormatSelection)
++
++    __storm_table__ = 'sourcepackageformatselection'
++
++    id = Int(primary=True)
++
++    distroseries_id = Int(name="distroseries")
++    distroseries = Reference(distroseries_id, 'DistroSeries.id')
++
++    format = DBEnum(enum=SourcePackageFormat)
++
++
++class SourcePackageFormatSelectionSet:
++    """See ISourcePackageFormatSelectionSet."""
++
++    implements(ISourcePackageFormatSelectionSet)
++
++    def getBySeriesAndFormat(self, distroseries, format):
++        """See `ISourcePackageFormatSelection`."""
++        return getUtility(IStoreSelector).get(
++            MAIN_STORE, DEFAULT_FLAVOR).find(
++                SourcePackageFormatSelection, distroseries=distroseries,
++                format=format).one()
++
++    def add(self, distroseries, format):
++        """See `ISourcePackageFormatSelection`."""
++        spfs = SourcePackageFormatSelection()
++        spfs.distroseries = distroseries
++        spfs.format = format
++        return getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR).add(
++            spfs)
 === modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
 --- lib/lp/soyuz/model/sourcepackagerelease.py	2009-11-07 09:50:37 +0000
 +++ lib/lp/soyuz/model/sourcepackagerelease.py	2009-11-16 23:27:14 +0000
@@ -36,6 +36,7 @@
  from lp.translations.interfaces.translationimportqueue import (
      ITranslationImportQueue)
  from canonical.launchpad.webapp.interfaces import NotFoundError
++from lp.archiveuploader.utils import determine_source_file_type
  from lp.soyuz.interfaces.archive import (
      ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
  from lp.soyuz.interfaces.build import BuildStatus
@@ -52,7 +53,7 @@
  from lp.soyuz.scripts.queue import QueueActionError
  from lp.registry.interfaces.person import validate_public_person
  from lp.registry.interfaces.sourcepackage import (
--    SourcePackageFileType, SourcePackageType, SourcePackageUrgency)
++    SourcePackageType, SourcePackageUrgency)
  def _filter_ubuntu_translation_file(filename):
@@ -271,19 +272,10 @@
      def addFile(self, file):
          """See ISourcePackageRelease."""
--        determined_filetype = None
--        if file.filename.endswith(".dsc"):
--            determined_filetype = SourcePackageFileType.DSC
--        elif file.filename.endswith(".orig.tar.gz"):
--            determined_filetype = SourcePackageFileType.ORIG
--        elif file.filename.endswith(".diff.gz"):
--            determined_filetype = SourcePackageFileType.DIFF
--        elif file.filename.endswith(".tar.gz"):
--            determined_filetype = SourcePackageFileType.TARBALL
--
--        return SourcePackageReleaseFile(sourcepackagerelease=self,
--                                        filetype=determined_filetype,
--                                        libraryfile=file)
++        return SourcePackageReleaseFile(
++            sourcepackagerelease=self,
++            filetype=determine_source_file_type(file.filename),
++            libraryfile=file)
      def _getPackageSize(self):
          """Get the size total (in KB) of files comprising this package.
 === modified file 'lib/lp/soyuz/scripts/packagecopier.py'
 --- lib/lp/soyuz/scripts/packagecopier.py	2009-10-29 12:18:05 +0000
 +++ lib/lp/soyuz/scripts/packagecopier.py	2009-11-16 23:27:14 +0000
@@ -36,6 +36,7 @@
      ISourcePackagePublishingHistory, active_publishing_status)
  from lp.soyuz.interfaces.queue import (
      IPackageUpload, IPackageUploadSet)
++from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
  from lp.soyuz.scripts.ftpmasterbase import (
      SoyuzScript, SoyuzScriptError)
  from lp.soyuz.scripts.processaccepted import (
@@ -356,6 +357,14 @@
                  "Cannot copy to an unsupported distribution: %s." %
                  source.distroseries.distribution.name)
++        format = SourcePackageFormat.getTermByToken(
++            source.sourcepackagerelease.dsc_format).value
++
++        if not series.isSourcePackageFormatPermitted(format):
++            raise CannotCopy(
++                "Source format '%s' not supported by target series %s." %
++                (source.sourcepackagerelease.dsc_format, series.name))
++
          if self.include_binaries:
              built_binaries = source.getBuiltBinaries()
              if len(built_binaries) == 0:
 === modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
 --- lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-10-05 18:29:12 +0000
 +++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-11-16 23:27:14 +0000
@@ -37,6 +37,8 @@
      PackagePublishingStatus, active_publishing_status)
  from lp.soyuz.interfaces.queue import (
      PackageUploadCustomFormat, PackageUploadStatus)
++from lp.soyuz.interfaces.sourcepackageformat import (
++    ISourcePackageFormatSelectionSet, SourcePackageFormat)
  from lp.soyuz.model.publishing import (
      SecureSourcePackagePublishingHistory,
      SecureBinaryPackagePublishingHistory)
@@ -720,6 +722,32 @@
              'Cannot copy to an unsupported distribution: ubuntu.',
              copy_checker.checkCopy, source, series, pocket)
++    def test_checkCopy_respects_sourceformatselection(self):
++        # A source copy should be denied if the source's dsc_format is
++        # not permitted in the target series.
++
++        # Get hoary, and configure it to accept 3.0 (quilt) uploads.
++        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
++        hoary = ubuntu.getSeries('hoary')
++        getUtility(ISourcePackageFormatSelectionSet).add(
++            hoary, SourcePackageFormat.FORMAT_3_0_QUILT)
++
++        # Create a 3.0 (quilt) source.
++        source = self.test_publisher.getPubSource(
++            distroseries=hoary, dsc_format='3.0 (quilt)')
++
++        archive = source.archive
++        series = ubuntu.getSeries('warty')
++        pocket = source.pocket
++
++        # An attempt to copy the source to warty, which only supports
++        # 1.0 sources, is rejected.
++        copy_checker = CopyChecker(archive, include_binaries=True)
++        self.assertRaisesWithContent(
++            CannotCopy,
++            "Source format '3.0 (quilt)' not supported by target series "
++            "warty.", copy_checker.checkCopy, source, series, pocket)
++
      def test_checkCopy_identifies_conflicting_copy_candidates(self):
          # checkCopy() is able to identify conflicting candidates within
          # the copy batch.
 === modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
 --- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2009-09-23 16:38:10 +0000
 +++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2009-11-16 23:27:14 +0000
@@ -23,8 +23,9 @@
      >>> bob_builder.builderok = True
      # Set a known duration for the current job.
--    >>> in_progress_build = removeSecurityProxy(
--    ...     bob_builder.currentjob.build)
++    >>> from lp.soyuz.interfaces.build import IBuildSet
++    >>> build2 = getUtility(IBuildSet).getByQueueEntry(bob_builder.currentjob)
++    >>> in_progress_build = removeSecurityProxy(build2)
      >>> one_minute = datetime.timedelta(seconds=60)
      >>> in_progress_build.estimated_build_duration = one_minute
@@ -122,12 +123,8 @@
      >>> login('foo.bar@canonical.com')
      >>> from canonical.database.constants import UTC_NOW
      >>> from lp.soyuz.interfaces.build import BuildStatus
--    >>> in_progress_build.buildstate = BuildStatus.NEEDSBUILD
--    >>> in_progress_build.buildqueue_record.buildstart = None
--    >>> in_progress_build.buildqueue_record.builder = None
--    >>> build.buildstate = BuildStatus.BUILDING
--    >>> build.buildqueue_record.buildstart = UTC_NOW
--    >>> build.buildqueue_record.builder = bob_builder
++    >>> in_progress_build.buildqueue_record.reset()
++    >>> build.buildqueue_record.markAsBuilding(bob_builder)
      >>> build.buildqueue_record.logtail = 'one line\nanother line'
      >>> logout()
 === modified file 'lib/lp/soyuz/templates/build-index.pt'
 --- lib/lp/soyuz/templates/build-index.pt	2009-09-17 12:08:45 +0000
 +++ lib/lp/soyuz/templates/build-index.pt	2009-11-16 23:27:14 +0000
@@ -161,8 +161,8 @@
        <tal:building condition="context/buildstate/enumvalue:BUILDING">
          <li>
            Started
--          <span tal:attributes="title view/buildqueue/buildstart/fmt:datetime"
--                tal:content="view/buildqueue/buildstart/fmt:approximatedate"
++          <span tal:attributes="title view/buildqueue/job/date_started/fmt:datetime"
++                tal:content="view/buildqueue/job/date_started/fmt:approximatedate"
              >5 minutes ago</span>
          </li>
        </tal:building>
 === modified file 'lib/lp/soyuz/templates/builder-index.pt'
 --- lib/lp/soyuz/templates/builder-index.pt	2009-09-16 19:06:48 +0000
 +++ lib/lp/soyuz/templates/builder-index.pt	2009-11-16 23:27:14 +0000
@@ -104,9 +104,14 @@
        </tal:buildernok>
      </tal:no_job>
++    <tal:comment replace="nothing">
++      In the very near future, 'job' will not just be a Build job.
++      The template needs to cope with that as and when new job types are
++      added.
++    </tal:comment>
      <tal:job condition="job">
        <span class="sortkey" tal:content="job/id" />
--      <tal:build define="build job/build">
++      <tal:build define="build job/specific_job/build">
          <tal:visible condition="build/required:launchpad.View">
            <tal:icon replace="structure build/image:icon" />
            Building
@@ -153,10 +158,12 @@
        <tal:job condition="job">
          <p class="sprite">Started
--          <span tal:attributes="title job/buildstart/fmt:datetime"
++          <span tal:attributes="title job/job/date_started/fmt:datetime"
                  tal:content="view/current_build_duration/fmt:exactduration"
              /> ago.</p>
--        <tal:visible condition="job/build/required:launchpad.View">
++        <tal:visible
++           define="build job/specific_job/build"
++           condition="build/required:launchpad.View">
            <tal:logtail condition="job/logtail">
              <h3>Buildlog</h3>
              <div tal:content="structure job/logtail/fmt:text-to-html"
 === modified file 'lib/lp/soyuz/templates/builds-list.pt'
 --- lib/lp/soyuz/templates/builds-list.pt	2009-08-18 12:33:37 +0000
 +++ lib/lp/soyuz/templates/builds-list.pt	2009-11-16 23:27:14 +0000
@@ -101,8 +101,8 @@
                  <tal:building condition="bq/builder">
                    Build started
                    <span
--                    tal:attributes="title bq/buildstart/fmt:datetime"
--                    tal:content="bq/buildstart/fmt:displaydate" />
++                    tal:attributes="title bq/job/date_started/fmt:datetime"
++                    tal:content="bq/job/date_started/fmt:displaydate" />
                    on
                    <a tal:content="bq/builder/title"
                       tal:attributes="href bq/builder/fmt:url"/>
 === modified file 'lib/lp/soyuz/tests/test_builder.py'
 --- lib/lp/soyuz/tests/test_builder.py	2009-11-11 10:43:07 +0000
 +++ lib/lp/soyuz/tests/test_builder.py	2009-11-16 23:27:14 +0000
@@ -9,8 +9,8 @@
  from canonical.testing import LaunchpadZopelessLayer
  from lp.soyuz.interfaces.archive import ArchivePurpose
++from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
  from lp.soyuz.interfaces.builder import IBuilderSet
--from lp.soyuz.interfaces.build import BuildStatus
  from lp.soyuz.interfaces.publishing import PackagePublishingStatus
  from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
  from lp.testing import TestCaseWithFactory
@@ -77,14 +77,16 @@
          # Asking frog to find a candidate should give us the joesppa build.
          next_job = self.frog_builder.findBuildCandidate()
--        self.assertEqual('joesppa', next_job.build.archive.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.assertEqual('joesppa', build.archive.name)
          # If bob is in a failed state the joesppa build is still
          # returned.
          self.bob_builder.builderok = False
          self.bob_builder.manual = False
          next_job = self.frog_builder.findBuildCandidate()
--        self.assertEqual('joesppa', next_job.build.archive.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.assertEqual('joesppa', build.archive.name)
  class TestFindBuildCandidatePPA(TestFindBuildCandidateBase):
@@ -156,14 +158,16 @@
          # A PPA cannot start a build if it would use 80% or more of the
          # builders.
          next_job = self.builder4.findBuildCandidate()
--        self.failIfEqual('joesppa', next_job.build.archive.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.failIfEqual('joesppa', build.archive.name)
      def test_findBuildCandidate_first_build_finished(self):
          # When joe's first ppa build finishes, his fourth i386 build
          # will be the next build candidate.
          self.joe_builds[0].buildstate = BuildStatus.FAILEDTOBUILD
          next_job = self.builder4.findBuildCandidate()
--        self.failUnlessEqual('joesppa', next_job.build.archive.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.failUnlessEqual('joesppa', build.archive.name)
      def test_findBuildCandidate_for_private_ppa(self):
          # If a ppa is private it will be able to have parallel builds
@@ -171,7 +175,8 @@
          self.ppa_joe.private = True
          self.ppa_joe.buildd_secret = 'sekrit'
          next_job = self.builder4.findBuildCandidate()
--        self.failUnlessEqual('joesppa', next_job.build.archive.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.failUnlessEqual('joesppa', build.archive.name)
  class TestFindBuildCandidateDistroArchive(TestFindBuildCandidateBase):
@@ -196,18 +201,18 @@
          # arch.
          next_job = self.builder2.findBuildCandidate()
--        self.failUnlessEqual('primary', next_job.build.archive.name)
--        self.failUnlessEqual(
--            'gedit', next_job.build.sourcepackagerelease.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.failUnlessEqual('primary', build.archive.name)
++        self.failUnlessEqual('gedit', build.sourcepackagerelease.name)
          # Now even if we set the build building, we'll still get the
          # second non-ppa build for the same archive as the next candidate.
--        next_job.build.buildstate = BuildStatus.BUILDING
--        next_job.build.builder = self.builder2
++        build.buildstate = BuildStatus.BUILDING
++        build.builder = self.builder2
          next_job = self.builder2.findBuildCandidate()
--        self.failUnlessEqual('primary', next_job.build.archive.name)
--        self.failUnlessEqual(
--            'firefox', next_job.build.sourcepackagerelease.name)
++        build = getUtility(IBuildSet).getByQueueEntry(next_job)
++        self.failUnlessEqual('primary', build.archive.name)
++        self.failUnlessEqual('firefox', build.sourcepackagerelease.name)
  def test_suite():
      return unittest.TestLoader().loadTestsFromName(__name__)
 === modified file 'lib/lp/translations/tests/test_translations_to_review.py'
 --- lib/lp/translations/tests/test_translations_to_review.py	2009-08-19 16:48:17 +0000
 +++ lib/lp/translations/tests/test_translations_to_review.py	2009-11-16 23:27:14 +0000
@@ -78,7 +78,7 @@
              translator=self.person, translations=['bi'],
              date_updated=self.base_time)
--        later_time = self.base_time + timedelta(0, 0, 1)
++        later_time = self.base_time + timedelta(0, 3600)
          self.suggestion = removeSecurityProxy(
              self.factory.makeTranslationMessage(
                  potmsgset=self.potmsgset, pofile=self.pofile,

Launchpad itself

Merge lp:~wgrant/launchpad/distroseries-source-format-selection-part1 into lp:launchpad

Commit message

Description of the change

Preview Diff

Subscribers