[Xen-devel] [PATCH OSSTEST] get_hostflags: return an empty list when there is no flight/job.

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

From: Ian Campbell <Ian.Campbell@xxxxxxxxxx>

Otherwise trying to use mg-hosts mkpxedir fails with:

$ OSSTEST_CONFIG=production-config-cambridge ./mg-hosts mkpxedir -n rice-weevil
2015-07-27 10:12:28 Z serial method sympathy rice-weevil: 
osstser1.xs.citrite.net /root/sympathy/rice-weevil 
/root/sympathy/rice-weevil.log*
2015-07-27 10:12:28 Z TftpScope is default
2015-07-27 10:12:28 Z task 260549 static ianc@osstest: ianc@osstest manual
Use of uninitialized value $otherflightjob in pattern match (m//) at Osstest.pm 
line 308.
Use of uninitialized value $otherflightjob in pattern match (m//) at Osstest.pm 
line 308.
Use of uninitialized value $otherflightjob in concatenation (.) or string at 
Osstest.pm line 308.
 ? at Osstest.pm line 308.

Signed-off-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
---
 Osstest/TestSupport.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 4696d68..19d643a 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1292,6 +1292,7 @@ sub git_dir_revision ($$) {
 sub get_hostflags ($) {
     my ($ident) = @_;
     # may be run outside transaction, or with flights locked
+    return () unless $flight && $job;
     my $flags= get_runvar_default('all_hostflags',     $job, '').','.
                get_runvar_default("${ident}_hostflags", $job, '');
     return grep /./, split /\,/, $flags;
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel