~bzr-pqm/bzr/bzr.dev

If there's an OS error running a user-specified editor, always show it,
regardless of errno.

added added

removed removed

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

## mutter("trying editor: %r", (edargs +[filename]))

x = call(edargs + [filename])

except OSError, e:

# We're searching for an editor, so catch safe errors and continue

# errno 193 is ERROR_BAD_EXE_FORMAT on Windows. Python2.4 uses the

# winerror for errno. Python2.5+ use errno ENOEXEC and set winerror

# to 193. However, catching 193 here should be fine. Other

# platforms aren't likely to have that high of an error. And even

# if they do, it is still reasonable to fall back to the next

# editor.

# 123 is "The Filename, Directory Name, or Volume Label Syntax Is

# Incorrect" (see

# <https://bugs.edge.launchpad.net/bzr/+bug/504842>)

if e.errno in (errno.ENOENT, errno.EACCES, errno.ENOEXEC, 193, 123):

if candidate_source is not None:

# We tried this editor because some user configuration (an

# environment variable or config file) said to try it. Let

# the user know their configuration is broken.

trace.warning(

'Could not start editor "%s" (specified by %s): %s\n'

% (candidate, candidate_source, str(e)))

continue