[Python-apps-commits] r5376 - in packages/osc/trunk/debian (6 files)

[nijel at users.alioth.debian.org]

    Date: Friday, June 11, 2010 @ 07:04:13
  Author: nijel
Revision: 5376

Use sensible-utils (Closes: #584483).

Added:
  packages/osc/trunk/debian/patches/
  packages/osc/trunk/debian/patches/osc-editor.patch
  packages/osc/trunk/debian/patches/series
Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/control
  packages/osc/trunk/debian/source/format

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2010-06-11 06:58:45 UTC (rev 5375)
+++ packages/osc/trunk/debian/changelog	2010-06-11 07:04:13 UTC (rev 5376)
@@ -2,8 +2,9 @@
 
   * New upstream release (Closes: #585124).
   * Update homepage URL.
+  * Use sensible-utils (Closes: #584483).
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 11 Jun 2010 08:58:32 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 11 Jun 2010 09:03:14 +0200
 
 osc (0.126-2) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/control
===================================================================
--- packages/osc/trunk/debian/control	2010-06-11 06:58:45 UTC (rev 5375)
+++ packages/osc/trunk/debian/control	2010-06-11 07:04:13 UTC (rev 5376)
@@ -13,7 +13,7 @@
 Package: osc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 2.5), python-urlgrabber, python-rpm, python-m2crypto
-Recommends: rpm2cpio, cpio
+Recommends: rpm2cpio, cpio, sensible-utils
 XB-Python-Version: ${python:Versions}
 Suggests: python-gnomekeyring, gnome-keyring
 Description: OpenSUSE (buildsystem) commander

Added: packages/osc/trunk/debian/patches/osc-editor.patch
===================================================================
--- packages/osc/trunk/debian/patches/osc-editor.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/osc-editor.patch	2010-06-11 07:04:13 UTC (rev 5376)
@@ -0,0 +1,86 @@
+Author: Michal ÄŒihaÅ™ <nijel at debian.org>
+Subject: Use sensible-utils for editing
+Forwarded: upstream
+
+diff --git a/osc/core.py b/osc/core.py
+index 3152380..e8ea092 100644
+--- a/osc/core.py
++++ b/osc/core.py
+@@ -2585,6 +2585,38 @@ def read_meta_from_spec(specfile, *args):
+ 
+     return spec_data
+ 
++def get_default_editor():
++    import platform
++    system = platform.system()
++    if system == 'Windows':
++        return 'notepad'
++    if system == 'Linux':
++        try:
++            # Python 2.6
++            dist = platform.linux_distribution()[0]
++        except AttributeError:
++            dist = platform.dist()[0]
++        if dist == 'debian':
++            return 'editor'
++        return 'vim'
++    return 'vi'
++
++def get_default_pager():
++    import platform
++    system = platform.system()
++    if system == 'Windows':
++        return 'less'
++    if system == 'Linux':
++        try:
++            # Python 2.6
++            dist = platform.linux_distribution()[0]
++        except AttributeError:
++            dist = platform.dist()[0]
++        if dist == 'debian':
++            return 'pager'
++        return 'less'
++    return 'more'
++
+ def run_pager(message):
+     import tempfile, sys
+ 
+@@ -2594,15 +2626,12 @@ def run_pager(message):
+         tmpfile = tempfile.NamedTemporaryFile()
+         tmpfile.write(message)
+         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)
+         tmpfile.close()
+ 
+ def run_editor(filename):
+-    if sys.platform[:3] != 'win':
+-        editor = os.getenv('EDITOR', default='vim')
+-    else:
+-        editor = os.getenv('EDITOR', default='notepad')
++    editor = os.getenv('EDITOR', default=get_default_editor())
+ 
+     return subprocess.call([ editor, filename ])
+ 
+@@ -3738,8 +3767,8 @@ def get_prj_results(apiurl, prj, hide_legend=False, csv=False, status_filter=Non
+     if root.find('result') == None:
+         return []
+     for results in root.findall('result'):
+-	for node in results:
+-	    pacs.append(node.get('package'))
++        for node in results:
++            pacs.append(node.get('package'))
+     pacs = sorted(list(set(pacs)))
+     for node in root.findall('result'):
+         # filter architecture and repository
+@@ -4912,8 +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)
+                     tmpfile.write(diff)
+                     tmpfile.flush()
+-                pager = os.getenv('EDITOR', default='less')
+-                subprocess.call('%s %s' % (pager, tmpfile.name), shell=True)
++                run_editor(tmpfile.name)
+             elif repl == 'c':
+                 print >>sys.stderr, 'Aborting'
+                 raise oscerr.UserAbort()

Added: packages/osc/trunk/debian/patches/series
===================================================================
--- packages/osc/trunk/debian/patches/series	                        (rev 0)
+++ packages/osc/trunk/debian/patches/series	2010-06-11 07:04:13 UTC (rev 5376)
@@ -0,0 +1 @@
+osc-editor.patch

Modified: packages/osc/trunk/debian/source/format
===================================================================
--- packages/osc/trunk/debian/source/format	2010-06-11 06:58:45 UTC (rev 5375)
+++ packages/osc/trunk/debian/source/format	2010-06-11 07:04:13 UTC (rev 5376)
@@ -1 +1 @@
-1.0
+3.0 (quilt)