github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-01-19 17:18:39 +00:00
Code Releases Activity

2006-06-10 17:36:09 by steve

Browse Source 
When a command fails show its output when running with --verbose *before*
 exiting
This commit is contained in:
steve 2006-06-10 17:36:09 +00:00
parent 625e9f599f
commit c09fcb72e9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bin/xen-create-image
View File

@ -394,7 +394,7 @@ Install an X11 server, using VNC and XDM
--
http://www.steve.org.uk/
$Id: xen-create-image,v 1.22 2006-06-10 17:28:41 steve Exp $
$Id: xen-create-image,v 1.23 2006-06-10 17:36:09 steve Exp $
=cut
@ -759,7 +759,7 @@ sub parseCommandLineArguments
"cache=s", \$CONFIG{'cache'},
"ide", \$CONFIG{'ide'},
"passwd", \$CONFIG{'passwd'},
"role", \$CONFIG{'role'},
"role=s", \$CONFIG{'role'},
"force", \$CONFIG{'force'},
# Help options
@ -776,7 +776,7 @@ sub parseCommandLineArguments
if ( $VERSION )
{
my $REVISION = '$Revision: 1.22 $';
my $REVISION = '$Revision: 1.23 $';
if ( $REVISION =~ /1.([0-9.]+) / )
{
@ -1304,7 +1304,8 @@ sub runCustomisationHooks
#
if ( $CONFIG{'verbose'} )
{
print "=============\n";
print "Customization Script Environment:\n";
print "---------------------------------\n";
foreach my $key ( sort keys %ENV )
{
print "\t'" . $key . "' = '" . $ENV{$key} . "'\n";
@ -1426,14 +1427,6 @@ sub runCommand
#
my $output = `$cmd`;
if ( $? != 0 )
{
print "Running command '$cmd' failed.\n";
print "Aborting\n";
exit;
}
#
# All done.
#
@ -1442,6 +1435,15 @@ sub runCommand
$CONFIG{'verbose'} && print $output . "\n";
$CONFIG{'verbose'} && print "Finished : $cmd\n";
if ( $? != 0 )
{
print "Running command '$cmd' failed.\n";
print "Aborting\n";
exit;
}
return( $output );
}