Package: osc
Severity: normal
Version: 0.126-2
Tags: patch

Please use sensible-utils instead of hardcoding fallbacks when EDITOR
and PAGER are not defined.
Patch included.

--- osc/core.py.orig	2010-06-03 09:56:03.904960814 +0300
+++ osc/core.py	2010-06-03 09:49:42.851959319 +0300
@@ -1400,7 +1400,7 @@
         mtime_orig = os.stat(filename).st_mtime
 
         if sys.platform[:3] != 'win':
-            editor = os.getenv('EDITOR', default='vim')
+            editor = os.getenv('EDITOR', default='editor')
         else:
             editor = os.getenv('EDITOR', default='notepad')
         while 1:
@@ -2209,7 +2209,7 @@
 
     def edit(self):
         if sys.platform[:3] != 'win':
-            editor = os.getenv('EDITOR', default='vim')
+            editor = os.getenv('EDITOR', default='editor')
         else:
             editor = os.getenv('EDITOR', default='notepad')
         try:
@@ -2444,7 +2444,7 @@
     f.close()
 
     if sys.platform[:3] != 'win':
-        editor = os.getenv('EDITOR', default='vim')
+        editor = os.getenv('EDITOR', default='editor')
     else:
         editor = os.getenv('EDITOR', default='notepad')
     try:
@@ -4643,7 +4643,7 @@
                     tmpfile.write(server_diff(apiurl, request.actions[0].dst_project, request.actions[0].dst_package, None,
                                   request.actions[0].src_project, request.actions[0].src_package, request.actions[0].src_rev, True, True))
                     tmpfile.flush()
-                pager = os.getenv('EDITOR', default='less')
+                pager = os.getenv('EDITOR', default='pager')
                 subprocess.call('%s %s' % (pager, tmpfile.name), shell=True)
             elif repl == 'c':
                 print >>sys.stderr, 'Aborting'
Thanks.

Reply via email to