- revert before update

- never install qt-copy. 

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=573582
wilder
Dirk Mueller 20 years ago
parent 226db4dc23
commit f85c09a9ed
  1. 17
      kdesvn-build

@ -1386,6 +1386,11 @@ sub update_module_path
p_chdir ($fullpath);
if (exists $ENV{"COVERITY_RUN"}) {
my @revert_args = ('svn', 'revert', '-R', '.');
run_svn($module, 'svn-revert', \@revert_args);
}
push @args, ('svn', 'up', '--non-interactive');
push @args, '-N' if scalar @path;
@ -1393,11 +1398,6 @@ sub update_module_path
$result = run_svn($module, 'svn-up', \@args);
if (exists $ENV{"COVERITY_RUN"}) {
my @revert_args = ('svn', 'revert', '-R', '.');
run_svn($module, 'svn-revert', \@revert_args);
}
if($result) # Update failed, try svn cleanup.
{
info "\tUpdate failed, trying a cleanup.";
@ -5234,6 +5234,13 @@ sub setup_option_defaults()
set_option('global', 'no-rebuild-on-fail', 1);
}
}
if (defined $ENV{"COVERITY_RUN"})
{
info "Coverity run. We'll just override some options you.";
set_option('qt-copy', "#install-after-build", 0);
}
}
# This subroutine checks if an appropriate dbus software is already installed.

Loading…
Cancel
Save