← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
63
63
            ## mutter("trying editor: %r", (edargs +[filename]))
64
64
            x = call(edargs + [filename])
65
65
        except OSError, e:
66
 
            # We're searching for an editor, so catch safe errors and continue
67
 
            if e.errno in (errno.ENOENT, errno.EACCES):
68
 
                if candidate_source is not None:
69
 
                    # We tried this editor because some user configuration (an
70
 
                    # environment variable or config file) said to try it.  Let
71
 
                    # the user know their configuration is broken.
72
 
                    trace.warning(
73
 
                        'Could not start editor "%s" (specified by %s): %s\n'
74
 
                        % (candidate, candidate_source, str(e)))
75
 
                continue
 
66
            if candidate_source is not None:
 
67
                # We tried this editor because some user configuration (an
 
68
                # environment variable or config file) said to try it.  Let
 
69
                # the user know their configuration is broken.
 
70
                trace.warning(
 
71
                    'Could not start editor "%s" (specified by %s): %s\n'
 
72
                    % (candidate, candidate_source, str(e)))
 
73
            continue
76
74
            raise
77
75
        if x == 0:
78
76
            return True