Commit 256fb1a6 authored by Michael Pyne's avatar Michael Pyne
Browse files

Always use unsermake's estimated progress output when using unsermake, and

remove an unnecessary pretend mode check.

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=438748
parent 660d9d66
......@@ -1112,6 +1112,14 @@ sub run_make_command
return log_command($module, $filename, \@command);
}
# Make sure -p is in the unsermake flags, it's the whole reason for using
# this function.
if (!(grep /^(-p)|(--print-progress)$/, @command))
{
# Add in front of element 1, deleting 0 elements.
splice @command, 1, 0, '-p';
}
if (pretending)
{
pretend "\tWould have run g[", join (' ', @command);
......@@ -1307,15 +1315,6 @@ sub safe_make (@)
my $builddir = "$pathinfo{fullpath}/$subdir";
$builddir =~ s/\/*$//;
if (pretending)
{
$opts = join(' ', @args);
pretend "\tWould have switched directory to y[$builddir]";
pretend "\tWould have run g[$opts > $logdir/$logname]";
next;
}
chdir ($builddir);
my $result = run_make_command ($module, $logname, \@args );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment