[dput-ng-maint] Bug#718011: dput-ng 1.5 broke SSH uploading for me

[Michael Stapelberg]

Package: dput-ng
Version: 1.5
Severity: normal

$ dput init-system-helpers_1.7\~bpo70+1_amd64.changes      
Uploading init-system-helpers using sftp to ftp-master (host: ssh.upload.debian.org; directory: /srv/upload.debian.org/UploadQueue/)
running allowed-distribution: check whether a local profile permits uploads to the target distribution
running protected-distribution: warn before uploading to distributions where a special policy applies
running checksum: verify checksums before uploading
running suite-mismatch: check the target distribution for common errors
running check-debs: makes sure the upload contains a binary package
running gpg: check GnuPG signatures before the upload
gpg: Signature made 2013-07-27T21:55:28 CEST using RSA key ID 4AC8EE1D
gpg: Good signature from "Michael Stapelberg <michael at stapelberg.de>"
gpg:                 aka "Michael Stapelberg (RENT-A-GURU) <michael at rent-a-guru.de>"
gpg:                 aka "Michael Stapelberg <stapelberg at debian.org>"

IdentityFile = ['/home/michael/.ssh/debian']
Traceback (most recent call last):
  File "/usr/bin/dput", line 92, in <module>
    upload_package(changes, args)
  File "/usr/lib/python2.7/dist-packages/dput/uploader.py", line 316, in invoke_dput
    simulate=args.simulate) as obj:
  File "/usr/lib/python2.7/contextlib.py", line 17, in __enter__
    return self.gen.next()
  File "/usr/lib/python2.7/dist-packages/dput/uploader.py", line 169, in uploader
    obj.initialize()
  File "/usr/lib/python2.7/dist-packages/dput/uploaders/sftp.py", line 148, in initialize
    pkey = os.path.expanduser(o['identityfile'])
  File "/usr/lib/python2.7/posixpath.py", line 261, in expanduser
    if not path.startswith('~'):
AttributeError: 'list' object has no attribute 'startswith'

This modification in line 147 of
/usr/lib/python2.7/dist-packages/dput/uploaders/sftp.py fixes the issue
for me for now, but might not be correct in all cases:

- pkey = os.path.expanduser(o['identityfile'])
+ pkey = os.path.expanduser(o['identityfile'][0])


-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: armel
i386

Kernel: Linux 3.8.3 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages dput-ng depends on:
ii  python       2.7.3-4
ii  python-dput  1.5

Versions of packages dput-ng recommends:
ii  bash-completion  1:2.0-1

dput-ng suggests no packages.

-- no debconf information