From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 3 Jul 2015 16:39:08 +0000 (+0100)
Subject: cr-ensure-disk-space: Honour -D
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=432efdfb59a88dcec72eb410a1eb844f74f3d1c4;p=osstest.git

cr-ensure-disk-space: Honour -D

Provide DEBUG and use db_prepare.  For now that is the only debugging
output.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 304f262..ced9777 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -27,11 +27,15 @@ use Fcntl qw(:flock);
 
 our $dryrun= 0;
 
+open DEBUG, ">/dev/null" or die $!;
+
 while (@ARGV && $ARGV[0] =~ m/^\-/) {
     $_= shift @ARGV;
     last if $_ eq '--';
     if (m/^-n$/) {
         $dryrun= 1;
+    } elsif (m/^-D$/) {
+        open DEBUG, ">&2" or die $!;
     } else {
 	die "$_ ?";
     }
@@ -50,7 +54,7 @@ flock LOCK, LOCK_EX or die $!;
 
 $|=1;
 
-my $chkq= $dbh_tests->prepare("SELECT * FROM flights WHERE flight=?");
+my $chkq= db_prepare("SELECT * FROM flights WHERE flight=?");
 our @flights;
 
 for (;;) {