boottool also depends on blkid.h, available on libblkid-devel
on Fedora, so since we're checking popt.h, let's include it
as well. Also, if something goes wrong, let's log the problem
as an error rather than a debug message.
Signed-off-by: Lucas Meneghel Rodrigues <l...@redhat.com>
---
client/tools/boottool | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/client/tools/boottool b/client/tools/boottool
index c0b095c..b84bc6a 100755
--- a/client/tools/boottool
+++ b/client/tools/boottool
@@ -1249,11 +1249,13 @@ class Grubby(object):
for line in lines:
self.log.debug(line.strip())
- try:
- find_header('popt.h')
- except ValueError:
- self.log.debug('No popt.h header present, skipping build')
- return False
+ header_list = ['popt.h', 'blkid.h']
+ for header in header_list:
+ try:
+ find_header(header)
+ except ValueError:
+ self.log.error('Missing %s header, skipping build', header)
+ return False
tarball_name = os.path.basename(tarball)
@@ -1265,7 +1267,7 @@ class Grubby(object):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
if result.wait() != 0:
- self.log.debug('Failed to build grubby during "make" step')
+ self.log.error('Failed to build grubby during "make" step')
log_lines(result.stderr.read().splitlines())
return False
@@ -1275,7 +1277,7 @@ class Grubby(object):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
if result.wait() != 0:
- self.log.debug('Failed to build grubby during "make install" step')
+ self.log.error('Failed to build grubby during "make install" step')
log_lines(result.stderr.read().splitlines())
return False
return True
--
1.7.10.1
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
