[Git][ftp-team/dak][master] 3 commits: Drop unused code

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

f2120922

by Niels Thykier at 2020-10-31T10:44:12+00:00

Drop unused code

Signed-off-by: Niels Thykier <niels@thykier.net>

880fd659

by Ansgar at 2020-10-31T11:45:14+01:00

daklib/checks.py: drop `SuffixCheck`

This was solved in a better way by having uploads from buildds use a
different filename, for example `*_${arch}-buildd.changes`.

89e55d4f

by Ansgar at 2020-10-31T11:47:40+01:00

Merge remote-tracking branch 'origin/merge-requests/224' into master

3 changed files:

daklib/archive.py
daklib/checks.py
daklib/dbconn.py

Changes:

daklib/archive.py

@@ -1010,7 +1010,6 @@ class ArchiveUpload(object):
                      checks.WeakSignatureCheck,
                      checks.SignatureTimestampCheck,
                      checks.ChangesCheck,
 -                    #checks.SuffixCheck,
                      checks.ExternalHashesCheck,
                      checks.SourceCheck,
                      checks.BinaryCheck,

daklib/checks.py

@@ -295,39 +295,6 @@ class ChangesCheck(Check):
          return True
 -class SuffixCheck(Check):
 -    """Checks suffix of .changes and .buildinfo files.
+-
 -    buildd uploads will include _${arch}.changes and _${arch}.buildinfo, so such endings
 -    should be reserved for uploads including binaries for ${arch} to avoid conflicts
 -    (for example in policy queues where dak stores the .changes and .buildinfo for later
 -    processing)
 -    """
+-
 -    def check(self, upload):
 -        session = upload.session
 -        changes = upload.changes
+-
 -        suffixes = []
+-
 -        changes_match = re_file_changes.match(changes.filename)
 -        assert(changes_match)
 -        suffixes.append((changes.filename, changes_match.group('suffix')))
+-
 -        for bi in changes.buildinfo_files:
 -            bi_match = re_file_buildinfo.match(bi.filename)
 -            assert(bi_match)
 -            suffixes.append((bi.filename, bi_match.group('suffix')))
+-
 -        for fn, suffix in suffixes:
 -            if suffix in changes.architectures:
 -                continue
 -            if session.query(Architecture).filter_by(arch_string=suffix).first():
 -                raise Reject("The upload includes '{}' whose filename includes the architecture name {}, but does not include binaries for {}. It is rejected to avoid filename conflicts with later buildd uploads.".format(fn, suffix, suffix))
+-
 -        return True
+-
+-
  class ExternalHashesCheck(Check):
      """Checks hashes in .changes and .dsc against an external database."""

daklib/dbconn.py

@@ -745,31 +745,10 @@ class PoolFile(ORMObject):
      def basename(self):
          return os.path.basename(self.filename)
 -    def is_valid(self, filesize=-1, md5sum=None):
 -        return self.filesize == int(filesize) and self.md5sum == md5sum
+-
      def properties(self):
          return ['filename', 'file_id', 'filesize', 'md5sum', 'sha1sum',
              'sha256sum', 'source', 'binary', 'last_used']
 -    def identical_to(self, filename):
 -        """
 -        compare size and hash with the given file
+-
 -        @rtype: bool
 -        @return: true if the given file has the same size and hash as this object; false otherwise
 -        """
 -        st = os.stat(filename)
 -        if self.filesize != st.st_size:
 -            return False
+-
 -        with open(filename, "r") as f:
 -            sha256sum = apt_pkg.sha256sum(f)
 -        if sha256sum != self.sha256sum:
 -            return False
+-
 -        return True
+-
  __all__.append('PoolFile')