[Git][ftp-team/dak][deploy] 3 commits: dep11-basic-validate.py: use `with` statement to manage file

Ansgar pushed to branch deploy at Debian FTP Team / dak

Commits:

65428330

by Ansgar at 2021-01-27T19:05:14+01:00

dep11-basic-validate.py: use `with` statement to manage file

Also read the file as text instead of reading it as binary and
decoding ourselves.

8f090ecf

by Ansgar at 2021-01-30T15:56:25+01:00

link_morgue.sh: always rsync hash file

We run link_morgue.sh daily on two different hosts.  When syncing the
file only when the hash file was updated (once daily) only one of
them would get told the file was updated, the other would reuse the
outdated file (now for over a year).

ac3c7a86
by Ansgar at 2021-02-01T12:33:52+01:00
```
Merge branch 'master' into deploy
```

Changes:

scripts/debian/dep11-basic-validate.py

@@ -161,16 +161,15 @@ def validate_data(data):
  def validate_file(fname):
 -    f = None
      if fname.endswith('.gz'):
 -        f = gzip.open(fname, 'r')
 +        opener = gzip.open
      elif fname.endswith('.xz'):
 -        f = lzma.open(fname, 'r')
 +        opener = lzma.open
      else:
 -        f = open(fname, 'r')
 +        opener = open
 -    data = str(f.read(), 'utf-8')
 -    f.close()
 +    with opener(fname, 'rt', encoding='utf-8') as fh:
 +        data = fh.read()
      return validate_data(data)

scripts/debian/link_morgue.sh

@@ -101,10 +101,8 @@ out=$(ssh ${DBHOST} preparehashes)
  # And now we get us the file here, so we can easily lookup hashes.
  # (the rsync uses the same ssh key and runs into the forced command.
  # That just knows to send the file for rsync instead of preparing it.)
 -if [[ ${out} == UPDATED ]]; then
 -    cd "${dbdir}"
 -    rsync ${DBHOST}:/srv/ftp-master.debian.org/home/hashes.gz ${HASHFILE}.gz
 -fi
 +cd "${dbdir}"
 +rsync ${DBHOST}:/srv/ftp-master.debian.org/home/hashes.gz ${HASHFILE}.gz
  cd "${PROCESSDIR}"
  log "Processing ${PROCESSDIR}"