Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit dac92a98 authored by Michael Pyne's avatar Michael Pyne

Correct return status in conflict checking and use log_command() to ensure a...

Correct return status in conflict checking and use log_command() to ensure a file is created for the error.log symlink

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=865557
parent fd415578
......@@ -5459,14 +5459,14 @@ EOF
kill "TERM", $pid; # Kill svn
waitpid ($pid, 0);
close SVN;
return 1;
return 0;
}
}
# conflicts cleared apparently.
waitpid ($pid, 0);
close SVN;
return 0;
return 1;
}
# Subroutine to build a given module. The module to build is the first
......@@ -5486,7 +5486,20 @@ sub build_module
update_module_environment($module);
return 0 if (module_has_conflict($module));
my $log_filter = sub {
return unless defined $_;
print $_ if /^C/;
print $_ if /Checking for/;
return;
};
# Use log_command as the check so that an error file gets created.
if (0 != log_command($module, 'conflict-check',
['kdesvn-build', 'module_has_conflict', $module], $log_filter)
)
{
return 0;
}
my $start_time = time;
while (not defined $package_opts{$module}->{'#was-rebuilt'})
......
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