[Pkg-libvirt-commits] [libguestfs] 83/146: diff/diff.c: diff output to show correct file handles and presence symbol

[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 a51e2009685648072547ceeb11a438d6cb61bb2b
Author: Gabriele Cerami <gcerami at redhat.com>
Date:   Mon Dec 15 19:19:39 2014 +0100

    diff/diff.c: diff output to show correct file handles and presence symbol
    
    (cherry picked from commit 5a4fd83176a93d0190b7584d799c3236f5c2ba48)
---
 diff/diff.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diff/diff.c b/diff/diff.c
index b113f29..2b600b0 100644
--- a/diff/diff.c
+++ b/diff/diff.c
@@ -605,7 +605,7 @@ static void
 deleted (guestfs_h *g, struct file *file)
 {
   output_start_line ();
-  output_string ("+");
+  output_string ("-");
   output_file (g, file);
   output_end_line ();
 }
@@ -666,7 +666,7 @@ changed (guestfs_h *g1, struct file *file1,
     output_end_line ();
     output_start_line ();
     output_string ("+");
-    output_file (g1, file1);
+    output_file (g2, file2);
     output_end_line ();
 
     /* Display stats fields that changed. */

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