~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-30 09:44:37 UTC
mfrom: (6015.26.2 trivial-2.4)
mto: (6015.33.1 2.4) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6206.1.1 2.5-client-reconnect-819604)
mto: This revision was merged to the branch mainline in revision 6124.
Revision ID: pqm@pqm.ubuntu.com-20110830094437-y5wu3f1jio1h70jo

Bug #827721, OS/IOError will have locale dependent encoding,
so use %r rather than %s.

added added

removed removed

325

if e.errno in (errno.ENOENT, errno.ENOTDIR):

326

raise errors.NoSuchFile(path, extra=e)

327

elif e.errno == errno.EINVAL:

328

mutter("EINVAL returned on path %s: %s" % (path, e))

328

mutter("EINVAL returned on path %s: %r" % (path, e))

329

raise errors.NoSuchFile(path, extra=e)

330

# I would rather use errno.EFOO, but there doesn't seem to be

331

# any matching for 267