[Pkg-libvirt-commits] [libguestfs] 132/146: launch: libvirt: In debug messages use ls --lcontext instead of ls -Z.

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository libguestfs.

commit d0284d206921753c4f2351f6c1bead0ee1b97e3d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Jan 24 08:45:48 2015 +0000

    launch: libvirt: In debug messages use ls --lcontext instead of ls -Z.
    
    ls -Z stops ls from displaying the size field.  --lcontext uses longer
    lines but has the advantage of still displaying the size field as well
    as the SELinux context.
    
    (cherry picked from commit f9c5b4aa2a6e8890eb20e15165bbe6820e6011b5)
---
 src/launch-libvirt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index f8f6213..9e7b10e 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -850,7 +850,7 @@ debug_appliance_permissions (guestfs_h *g)
   guestfs___cmd_add_arg (cmd, "ls");
   guestfs___cmd_add_arg (cmd, "-a");
   guestfs___cmd_add_arg (cmd, "-l");
-  guestfs___cmd_add_arg (cmd, "-Z");
+  guestfs___cmd_add_arg (cmd, "--lcontext");
   guestfs___cmd_add_arg (cmd, appliance);
   guestfs___cmd_set_stdout_callback (cmd, debug_permissions_cb, NULL, 0);
   guestfs___cmd_run (cmd);
@@ -865,7 +865,7 @@ debug_socket_permissions (guestfs_h *g)
     guestfs___cmd_add_arg (cmd, "ls");
     guestfs___cmd_add_arg (cmd, "-a");
     guestfs___cmd_add_arg (cmd, "-l");
-    guestfs___cmd_add_arg (cmd, "-Z");
+    guestfs___cmd_add_arg (cmd, "--lcontext");
     guestfs___cmd_add_arg (cmd, g->tmpdir);
     guestfs___cmd_set_stdout_callback (cmd, debug_permissions_cb, NULL, 0);
     guestfs___cmd_run (cmd);

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