[Git][ftp-team/dak][master] 7 commits: Accept Multi-Arch: no fields again

Ansgar Burchardt pushed to branch master at Debian FTP Team / dak

Commits:

a1e90375

by Guillem Jover at 2018-11-05T23:20:59Z

Accept Multi-Arch: no fields again

The affected packages broken by that field value are fixed since
Debian oldstable (Jessie). See also #759099.

Closes: #796213

4c22c773

by Guillem Jover at 2018-11-10T02:42:05Z

Only require the .changes Binary and Description fields on binary uploads

For source-only uploads the fields should have been empty all along,
because there are no binary packages to include, but dpkg-genchanges
has incorrectly included all binary names that can be produced from
the debian/control template file (see #818618). Although DAK allows
an empty Binary field, the correct behavior should be for the field
to not be present if there are not binary packages to upload.

b42a9e26
by Ansgar Burchardt at 2018-11-10T10:34:05Z
```
d/control: Debian buster now has PostgreSQL 11
```

61ee8e74

by Ansgar Burchardt at 2018-11-10T10:35:03Z

pointrelease: remove ChangeLog~ also after second editor session

ff99fab7

by Ansgar Burchardt at 2018-11-10T10:40:14Z

Merge remote-tracking branch 'guillem/pu/multi-arch-no'

6715c86a

by Ansgar Burchardt at 2018-11-10T10:42:03Z

ChangesCheck: correct reject message when "Description" field is missing

a144bb49
by Ansgar Burchardt at 2018-11-10T10:42:54Z
```
Merge branch 'pu/changes-binary-field'
```

Changes:

config/debian/pointrelease

@@ -252,6 +252,7 @@ if [[ ${hadrms} -ne 0 ]]; then
      echo "You did some removals, please copy their entries into the changelog"
      confirm
      $EDITOR ${ftpdir}/dists/${suite}/ChangeLog ${webdir}/removals.txt
 +    rm -f ${ftpdir}/dists/${suite}/ChangeLog~
  fi
  log "Checking for d-i updates"

daklib/checks.py

@@ -230,10 +230,15 @@ class ChangesCheck(Check):
          control = changes.changes
          fn = changes.filename
 -        for field in ('Distribution', 'Source', 'Binary', 'Architecture', 'Version', 'Maintainer', 'Files', 'Changes', 'Description'):
 +        for field in ('Distribution', 'Source', 'Architecture', 'Version', 'Maintainer', 'Files', 'Changes'):
              if field not in control:
                  raise Reject('{0}: misses mandatory field {1}'.format(fn, field))
 +        if len(changes.binaries) > 0:
 +            for field in ('Binary', 'Description'):
 +                if field not in control:
 +                    raise Reject('{0}: binary upload requires {1} field'.format(fn, field))
++
          check_fields_for_valid_utf8(fn, control)
          source_match = re_field_source.match(control['Source'])
@@ -476,11 +481,6 @@ class BinaryCheck(Check):
                  except:
                      raise Reject('{0}: APT could not parse {1} field'.format(fn, field))
 -        # "Multi-Arch: no" breaks wanna-build, #768353
 -        multi_arch = control.get("Multi-Arch")
 -        if multi_arch == 'no':
 -            raise Reject('{0}: Multi-Arch: no support in Debian is broken (#768353)'.format(fn))
+-
  class BinaryTimestampCheck(Check):
      """check timestamps of files in binary packages

daklib/upload.py

@@ -426,7 +426,7 @@ class Changes(object):
          """names of included binary packages
          @type: list of str
          """
 -        return self.changes['Binary'].split()
 +        return self.changes.get('Binary', '').split()
      @property
      def closed_bugs(self):

daklib/utils.py

@@ -273,8 +273,8 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
      if not dsc_file:
          # Finally ensure that everything needed for .changes is there
 -        must_keywords = ('Format', 'Date', 'Source', 'Binary', 'Architecture', 'Version',
 -                         'Distribution', 'Maintainer', 'Description', 'Changes', 'Files')
 +        must_keywords = ('Format', 'Date', 'Source', 'Architecture', 'Version',
 +                         'Distribution', 'Maintainer', 'Changes', 'Files')
          missingfields = []
          for keyword in must_keywords:

debian/control

@@ -7,8 +7,8 @@ Build-Depends: alembic,
                 debhelper (>= 11.2~) | fakeroot,
                 dpkg-dev (>= 1.19.0.5) | fakeroot,
                 jq,
 -               postgresql-10 | postgresql-9.6 | postgresql-9.4,
 -               postgresql-10-debversion | postgresql-9.6-debversion | postgresql-9.4-debversion,
 +               postgresql-11 | postgresql-9.6 | postgresql-9.4,
 +               postgresql-11-debversion | postgresql-9.6-debversion | postgresql-9.4-debversion,
                 python-all-dev,
                 python-apt,
                 python-debian,