git: gitorious is going away, remove its workaround.

wilder
Michael Pyne 11 years ago
parent a28fb7f9e5
commit 1c26b29511
  1. 10
      modules/ksb/BuildSystem/Qt4.pm
  2. 9
      modules/ksb/Updater/Git.pm
  3. 8
      modules/ksb/Util.pm

@ -26,16 +26,6 @@ sub name
return 'Qt';
}
# If coming from gitorious.org instead of KDE's mirror we should force on
# progress output to work around a gitorious.org clone bug.
sub forceProgressOutput
{
my $self = assert_isa(shift, 'ksb::BuildSystem::Qt4');
my $module = $self->module();
return $module->getOption('repository') =~ /gitorious\.org\//;
}
# Return value style: boolean
sub configureInternal
{

@ -79,15 +79,6 @@ sub clone
my $ipc = $self->{ipc} // croak_internal ('Missing IPC object');
# The -v forces progress output from git, which seems to work around either
# a gitorious.org bug causing timeout errors after cloning large
# repositories (such as Qt...)
if ($module->buildSystemType() eq 'Qt' &&
$module->buildSystem()->forceProgressOutput())
{
unshift (@args, '-v');
}
note ("Cloning g[$module]");
my $result = eval { $self->installGitSnapshot() };

@ -518,13 +518,7 @@ sub log_command
}
# Make sure we log everything.
# In the case of Qt, we may have forced on progress output so let's
# leave that interactive to keep the logs sane.
if (!($module->buildSystemType() eq 'Qt' &&
$module->buildSystem()->forceProgressOutput()))
{
open (STDERR, ">&STDOUT");
}
open (STDERR, ">&STDOUT");
# Call internal function, name given by $command[1]
if ($command[0] eq 'kdesrc-build')

Loading…
Cancel
Save