mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-07-09 09:06:12 +02:00
Notify user when config directory can't be created because there is already a file with the same name (#1134)
* Moving configuration values and methods from install.py to config.py -- everything is broken right now * Using context to store config path - still lots broken * Use mocks and context.config_path to store test configs - many tests still broken though * Update changelog [ci skip] * Fix jrnl --ls crash * Fix crash when no editor configured * Attempt to patch config path with test data - doesn't appear to be working * Properly use patched config path and add config given to scenario that wasn't using it * Fix copypasta * Fix editor test that needed patched config and trapping for system exit * Add exception and handling for when configuration directory is actually a file * Remove extraneous comment * Use more generic JrnlError with messaging switchboard * Format code a bit nicer * Remove unnecessary given in diagnostic test * Ensure full error message is output * Remove unnecessary whitespace characters
This commit is contained in:
parent
e0c53c28bb
commit
c155bafa84
8 changed files with 182 additions and 97 deletions
|
@ -11,6 +11,7 @@ from .color import ERROR_COLOR
|
|||
from .color import RESET_COLOR
|
||||
from .config import get_journal_name
|
||||
from .config import scope_config
|
||||
from .config import get_config_path
|
||||
from .editor import get_text_from_editor
|
||||
from .editor import get_text_from_stdin
|
||||
from .exception import UserAbort
|
||||
|
@ -228,7 +229,7 @@ def _edit_search_results(config, journal, old_entries, **kwargs):
|
|||
f"""
|
||||
[{ERROR_COLOR}ERROR{RESET_COLOR}: There is no editor configured.]
|
||||
|
||||
Please specify an editor in config file ({install.CONFIG_FILE_PATH})
|
||||
Please specify an editor in config file ({get_config_path()})
|
||||
to use the --edit option.
|
||||
""",
|
||||
file=sys.stderr,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue