← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/archiveuploader/nascentuploadfile.py

  • Committer: Curtis Hovey
  • Date: 2011-08-21 14:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 13745.
  • Revision ID: curtis.hovey@canonical.com-20110821142106-x93hajd6iguma8gx
Update test that was enforcing bad grammar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/archiveuploader/nascentuploadfile.py
1
 
# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
2
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 
4
4
"""Specific models for uploaded files"""
19
19
    'splitComponentAndSection',
20
20
    ]
21
21
 
 
22
import apt_inst
 
23
import apt_pkg
 
24
from debian.deb822 import Deb822Dict
22
25
import hashlib
23
26
import os
24
27
import subprocess
25
28
import sys
26
29
import time
27
30
 
28
 
import apt_inst
29
 
import apt_pkg
30
 
from debian.deb822 import Deb822Dict
31
31
from zope.component import getUtility
32
32
 
 
33
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
33
34
from canonical.librarian.utils import filechunks
34
35
from lp.app.errors import NotFoundError
35
36
from lp.archiveuploader.utils import (
46
47
    )
47
48
from lp.buildmaster.enums import BuildStatus
48
49
from lp.services.encoding import guess as guess_encoding
49
 
from lp.services.librarian.interfaces import ILibraryFileAliasSet
50
50
from lp.soyuz.enums import (
51
51
    BinaryPackageFormat,
52
52
    PackagePublishingPriority,
706
706
            yield UploadError(
707
707
                "%s: second chunk is %s, expected control.tar.gz." % (
708
708
                self.filename, control_tar))
709
 
        if data_tar not in ("data.tar.gz", "data.tar.bz2", "data.tar.lzma",
710
 
                            "data.tar.xz"):
 
709
        if data_tar not in ("data.tar.gz", "data.tar.bz2", "data.tar.lzma"):
711
710
            yield UploadError(
712
711
                "%s: third chunk is %s, expected data.tar.gz, "
713
 
                "data.tar.bz2, data.tar.lzma or data.tar.xz." %
714
 
                (self.filename, data_tar))
715
 
 
716
 
        # xz-compressed debs must pre-depend on dpkg >= 1.15.6~.
717
 
        XZ_REQUIRED_DPKG_VER = '1.15.6~'
718
 
        if data_tar == "data.tar.xz":
719
 
            parsed_deps = []
720
 
            try:
721
 
                parsed_deps = apt_pkg.ParseDepends(
722
 
                    self.control['Pre-Depends'])
723
 
            except (ValueError, TypeError):
724
 
                yield UploadError(
725
 
                    "Can't parse Pre-Depends in the control file.")
726
 
                return
727
 
            except KeyError:
728
 
                # Go past the for loop and yield the error below.
729
 
                pass
730
 
 
731
 
            for token in parsed_deps:
732
 
                try:
733
 
                    name, version, relation = token[0]
734
 
                except ValueError:
735
 
                    yield("APT error processing token '%r' from Pre-Depends.")
736
 
                    return
737
 
 
738
 
                if name == 'dpkg':
739
 
                    # VersionCompare returns values similar to cmp;
740
 
                    # negative if first < second, zero if first ==
741
 
                    # second and positive if first > second.
742
 
                    if apt_pkg.VersionCompare(
743
 
                        version, XZ_REQUIRED_DPKG_VER) >= 0:
744
 
                        # Pre-Depends dpkg is fine.
745
 
                        return
746
 
                    else:
747
 
                        yield UploadError(
748
 
                            "Pre-Depends dpkg version should be >= %s "
749
 
                            "when using xz compression." %
750
 
                            XZ_REQUIRED_DPKG_VER)
751
 
                        return
752
 
 
753
 
            yield UploadError(
754
 
                "Require Pre-Depends: dpkg (>= %s) when using xz "
755
 
                "compression." % XZ_REQUIRED_DPKG_VER)
 
712
                "data.tar.bz2 or data.tar.lzma." % (self.filename, data_tar))
756
713
 
757
714
    def verifyDebTimestamp(self):
758
715
        """Check specific DEB format timestamp checks."""
770
727
                                "control.tar.gz")
771
728
            # Only one of these files is present in the archive, so loop
772
729
            # until we find one of them, otherwise fail.
773
 
            data_files = ("data.tar.gz", "data.tar.bz2", "data.tar.lzma",
774
 
                          "data.tar.xz")
 
730
            data_files = ("data.tar.gz", "data.tar.bz2", "data.tar.lzma")
775
731
            for file in data_files:
776
732
                deb_file.seek(0)
777
733
                try:
819
775
            yield UploadError("%s: deb contents timestamp check failed: %s"
820
776
                 % (self.filename, error))
821
777
 
 
778
 
822
779
    #
823
780
    #   Database relationship methods
824
781
    #
848
805
                "Unable to find source package %s/%s in %s" % (
849
806
                self.source_name, self.source_version, distroseries.name))
850
807
 
 
808
 
851
809
    def verifySourcePackageRelease(self, sourcepackagerelease):
852
810
        """Check if the given ISourcePackageRelease matches the context."""
853
811
        assert 'source' in self.changes.architectures, (