mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-24 19:22:13 +01:00
Code

Use new functions for getting default pager/editor.

Browse Source
This commit is contained in:
Michal Čihař 2010-06-09 14:22:46 +02:00
parent 42b5f3961d
commit 5e817707cf
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/core.py
View File

@ -2626,15 +2626,12 @@ def run_pager(message):
tmpfile = tempfile.NamedTemporaryFile() tmpfile = tempfile.NamedTemporaryFile()
tmpfile.write(message) tmpfile.write(message)
tmpfile.flush() tmpfile.flush()
pager = os.getenv('PAGER', default='less') pager = os.getenv('PAGER', default=get_default_pager())
subprocess.call('%s %s' % (pager, tmpfile.name), shell=True) subprocess.call('%s %s' % (pager, tmpfile.name), shell=True)
tmpfile.close() tmpfile.close()
def run_editor(filename): def run_editor(filename):
if sys.platform[:3] != 'win': editor = os.getenv('EDITOR', default=get_default_editor())
editor = os.getenv('EDITOR', default='vim')
else:
editor = os.getenv('EDITOR', default='notepad')
return subprocess.call([ editor, filename ]) return subprocess.call([ editor, filename ])
@ -4944,7 +4941,7 @@ def request_interactive_review(apiurl, request):
request.actions[0].src_project, request.actions[0].src_package, request.actions[0].src_rev, True, False) request.actions[0].src_project, request.actions[0].src_package, request.actions[0].src_rev, True, False)
tmpfile.write(diff) tmpfile.write(diff)
tmpfile.flush() tmpfile.flush()
pager = os.getenv('EDITOR', default='less') pager = os.getenv('EDITOR', default=get_default_editor())
subprocess.call('%s %s' % (pager, tmpfile.name), shell=True) subprocess.call('%s %s' % (pager, tmpfile.name), shell=True)
elif repl == 'c': elif repl == 'c':
print >>sys.stderr, 'Aborting' print >>sys.stderr, 'Aborting'