[Pkg-libvirt-commits] [libguestfs] 80/266: v2v: Don't disable trace/debug set by environment variables.

[Hilko Bengen]

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

bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.

commit 0a816c020c00e1b44dba3c4809eca91f70422a13
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Aug 13 14:38:34 2014 +0100

    v2v: Don't disable trace/debug set by environment variables.
    
    If the environment variables LIBGUESTFS_TRACE=1 or LIBGUESTFS_DEBUG=1
    were set, then the current code would end up disabling trace/debug if
    the command line arguments did not contain -x/-v.
    
    Fix this so the effect of enabling trace/debug is cumulative.
---
 v2v/v2v.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 6f6ee93..6f36a22 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -77,8 +77,8 @@ let rec main () =
   (* Open the guestfs handle. *)
   msg (f_"Opening the overlay");
   let g = new G.guestfs () in
-  g#set_trace trace;
-  g#set_verbose verbose;
+  if trace then g#set_trace true;
+  if verbose then g#set_verbose true;
   g#set_network true;
   List.iter (
     fun (overlay, _, _) ->

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