From 023a2426d9ddcee3b292fe09a8c1b6372a263e7f Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Sun, 24 Apr 2011 00:27:47 +0200 Subject: [PATCH] - osc rq show -d: store tmpfile with suffix ".diff" (for syntax highlighting) - run_pager: added optional "tmp_suffix" parameter --- osc/commandline.py | 2 +- osc/core.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index d0f028c4..1a8a14dd 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1982,7 +1982,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. action.tgt_project, action.tgt_package) diff += submit_action_diff(apiurl, action) diff += '\n\n' - run_pager(diff) + run_pager(diff, tmp_suffix='') # checkout elif cmd == 'checkout' or cmd == 'co': diff --git a/osc/core.py b/osc/core.py index f459b918..bf6d19c6 100644 --- a/osc/core.py +++ b/osc/core.py @@ -3394,7 +3394,7 @@ def get_default_pager(): return 'less' return 'more' -def run_pager(message): +def run_pager(message, tmp_suffix=''): import tempfile, sys if not message: @@ -3403,7 +3403,7 @@ def run_pager(message): if not sys.stdout.isatty(): print message else: - tmpfile = tempfile.NamedTemporaryFile() + tmpfile = tempfile.NamedTemporaryFile(suffix=tmp_suffix) tmpfile.write(message) tmpfile.flush() pager = os.getenv('PAGER', default=get_default_pager()) @@ -5972,7 +5972,7 @@ def request_interactive_review(apiurl, request, initial_cmd=''): tmpfile.close() tmpfile = None if tmpfile is None: - tmpfile = tempfile.NamedTemporaryFile() + tmpfile = tempfile.NamedTemporaryFile(suffix='.diff') for action in sr_actions: diff = 'old: %s/%s\nnew: %s/%s\n' % (action.src_project, action.src_package, action.tgt_project, action.tgt_package)