From bb1dcea89474cd3feccecf692293cf661866c8e8 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 3 Dec 2011 00:03:00 +0200 Subject: [PATCH] And VISUAL --- enforced-editing-wrapper | 6 ++++++ submittodebian | 3 +++ 2 files changed, 9 insertions(+) diff --git a/enforced-editing-wrapper b/enforced-editing-wrapper index 4d11d8c..27917f8 100755 --- a/enforced-editing-wrapper +++ b/enforced-editing-wrapper @@ -18,6 +18,7 @@ # Wraps sensisible-editor in checks for remaining boilerplate. # Configured through environment variables: # UDT_EDIT_WRAPPER_EDITOR: The user's usual $EDITOR +# UDT_EDIT_WRAPPER_VISUAL: The user's usual $VISUAL # UDT_EDIT_WRAPPER_TEMPLATE_RE: An extra boilerplate-detecting regex. # UDT_EDIT_WRAPPER_FILE_DESCRIPTION: The type of file being edited. @@ -43,6 +44,11 @@ def main(): else: del os.environ['EDITOR'] + if 'UDT_EDIT_WRAPPER_VISUAL' in os.environ: + os.environ['VISUAL'] = os.environ['UDT_EDIT_WRAPPER_VISUAL'] + else: + del os.environ['VISUAL'] + placeholders = [] if 'UDT_EDIT_WRAPPER_TEMPLATE_RE' in os.environ: placeholders.append(re.compile( diff --git a/submittodebian b/submittodebian index 293c244..de82603 100755 --- a/submittodebian +++ b/submittodebian @@ -126,7 +126,10 @@ def submit_bugreport(body, debdiff, deb_version, changelog): env = dict(os.environ.items()) if 'EDITOR' in env: env['UDT_EDIT_WRAPPER_EDITOR'] = env['EDITOR'] + if 'VISUAL' in env: + env['UDT_EDIT_WRAPPER_VISUAL'] = env['VISUAL'] env['EDITOR'] = os.path.join(editor_path, 'enforced-editing-wrapper') + env['VISUAL'] = os.path.join(editor_path, 'enforced-editing-wrapper') env['UDT_EDIT_WRAPPER_TEMPLATE_RE'] = ( '.*REPLACE THIS WITH ACTUAL INFORMATION.*') env['UDT_EDIT_WRAPPER_FILE_DESCRIPTION'] = 'bug report'