[Pkg-libvirt-commits] [libvirt] 04/05: Use sensible-editor as fallback

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.6-1
in repository libvirt.

commit 74baa7ec7006e6d66f0cdbc99732d994c3fe6103
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jul 22 22:27:39 2014 +0200

    Use sensible-editor as fallback
    
    Based on a patch by Dmitry Smirnov
    
    Closes: #594444
---
 .../patches/Use-sensible-editor-as-fallback.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/Use-sensible-editor-as-fallback.patch b/debian/patches/Use-sensible-editor-as-fallback.patch
new file mode 100644
index 0000000..525134d
--- /dev/null
+++ b/debian/patches/Use-sensible-editor-as-fallback.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Tue, 22 Jul 2014 22:27:09 +0200
+Subject: Use sensible-editor as fallback
+
+Closes: #594444
+---
+ tools/virsh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/virsh.c b/tools/virsh.c
+index 3927120..52cd1e5 100644
+--- a/tools/virsh.c
++++ b/tools/virsh.c
+@@ -765,7 +765,7 @@ vshEditFile(vshControl *ctl, const char *filename)
+     if (!editor)
+         editor = virGetEnvBlockSUID("EDITOR");
+     if (!editor)
+-        editor = "vi"; /* could be cruel & default to ed(1) here */
++        editor = "sensible-editor";
+ 
+     /* Check that filename doesn't contain shell meta-characters, and
+      * if it does, refuse to run.  Follow the Unix conventions for
diff --git a/debian/patches/series b/debian/patches/series
index 5e1efae..3f373df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
 Skip-vircgrouptest.patch
 Include-param.h-on-kFreeBSD.patch
+Use-sensible-editor-as-fallback.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git