Post-merge fixes, dealing with a few undefs

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 2fc374deab059bd19e5a9dce2f68a3b1cf67e278..e58a7cc0a348a4d84a6ad04d24bd1e284f60044c 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -20,6 +20,8 @@ package Osstest::Debian;
 use strict;
 use warnings;
 
+use IO::File;
+
 use Osstest;
 use Osstest::TestSupport;
 

diff --git a/Osstest/Logtailer.pm b/Osstest/Logtailer.pm
index 6f19fcc32e0ffa864ca0daaa14773aec34ba6f57..3901ff5fd7b2d0a132b10bad9faa08799c587bf0 100644 (file)
--- a/Osstest/Logtailer.pm
+++ b/Osstest/Logtailer.pm
@@ -23,6 +23,7 @@ package Osstest::Logtailer;
 
 use Fcntl qw(:seek);
 use POSIX;
+use IO::File;
 
 BEGIN {
     use Exporter ();

diff --git a/Osstest/PDU/manual.pm b/Osstest/PDU/manual.pm
index 62f3f6a0b297110eb8c10c06bd991f58d3bfe1e3..505b9b6bf1d1206464dd7460047f66cf058c90a1 100644 (file)
--- a/Osstest/PDU/manual.pm
+++ b/Osstest/PDU/manual.pm
@@ -21,6 +21,7 @@ use strict;
 use warnings;
 
 use Osstest;
+use IO::File;
 
 BEGIN {
     use Exporter ();

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 684c0a53a4b85016d2f28991dcd371171c1c71e5..5fd9531dd23fa9295e364e02144eca630dfc852e 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -29,6 +29,8 @@ use IPC::Open2;
 use Osstest;
 use Osstest::Logtailer;
 use File::Copy;
+use File::Basename;
+use IO::Handle;
 
 BEGIN {
     use Exporter ();

diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive
index c24c0a2342806b613f5fd64466646c9813b5d9cf..91be57b6f270f8aff421ae044f689acaa3b8f423 100755 (executable)
--- a/ts-hosts-allocate-Executive
+++ b/ts-hosts-allocate-Executive
@@ -337,7 +337,8 @@ END
                 print DEBUG "$dbg $khash ($kdb) FROM-RES-PROP $val\n";
             } else {
                 $val= $hid->{"Default$khash"};
-                print DEBUG "$dbg $khash ($kdb) FROM-DEFAULT $val\n";
+                print DEBUG "$dbg $khash ($kdb) FROM-DEFAULT ".
+                   (defined $val ? $val : '<undef>')."\n";
             }
             $candrow->{$khash}= $val;
         }

diff --git a/ts-xen-build b/ts-xen-build
index 13412380a4309f3d248ab986945b75f65d50e810..a600fe5db1105900acd1e0442831b8311d4b1183 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -45,7 +45,7 @@ sub checkout () {
 
     my $linux_url_envvar= 'XEN_LINUX_GIT_URL';
     my $linux_rev_envvar= 'XEN_LINUX_GITREV';
-    if (length $r{tree_linux} && $r{tree_linux} =~ m/\.hg$/) {
+    if (defined $r{tree_linux} && $r{tree_linux} =~ m/\.hg$/) {
         $linux_url_envvar= 'XEN_LINUX_HGREPO';
         $linux_rev_envvar= 'XEN_LINUX_HGREV';
     }

diff --git a/ts-xen-install b/ts-xen-install
index 806e2513d205e87fcbbfe9c2665bc222ba385096..0d65d8b3159a51470b9c6aa30a2f51b0d703f051 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -67,7 +67,7 @@ sub adjustconfig () {
     target_editfile_root($ho, "/etc/xen/xend-config.sxp",
                         "xend-config.sxp", sub {
        my (@domains) = (qw(localhost localhost.localdomain),
-                        ".".$c{Domain}, ".".$c{TestHostDomain});
+                        ".".$c{DnsDomain}, ".".$c{TestHostDomain});
        logm("relocation domains: @domains");
        foreach (@domains) {
            s/\./\\$&/g;