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 = '<email address hidden>'
> >          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.
> >