|
|
|
|
@ -1778,11 +1778,14 @@ sub git_clone_module |
|
|
|
|
my $module = shift; |
|
|
|
|
my $git_repo = shift; |
|
|
|
|
my $srcdir = get_fullpath($module, 'source'); |
|
|
|
|
my @args = ('--', $git_repo, $srcdir); |
|
|
|
|
|
|
|
|
|
# The -v forces progress output from git, which seems to work around either a git or |
|
|
|
|
# gitorious.org bug causing timeout errors after cloning large repositories (such as |
|
|
|
|
# qt-copy...) |
|
|
|
|
my $result = log_command($module, 'git-clone', ['git', 'clone', '-v', '--', $git_repo, $srcdir]); |
|
|
|
|
# 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-copy...) |
|
|
|
|
unshift (@args, '-v') if $module eq 'qt-copy'; |
|
|
|
|
|
|
|
|
|
my $result = log_command($module, 'git-clone', ['git', 'clone', @args]); |
|
|
|
|
if ($result == 0) { |
|
|
|
|
set_persistent_option($module, 'git-cloned-repository', $git_repo); |
|
|
|
|
} |
|
|
|
|
@ -2374,7 +2377,7 @@ sub log_command |
|
|
|
|
# don't redirect stderr in that case. |
|
|
|
|
# In the case of git, we forced on progress output so let's leave that |
|
|
|
|
# interactive to keep the logs sane. |
|
|
|
|
open (STDERR, ">&STDOUT") unless $command[0] eq 'svn' || $command[0] eq 'git'; |
|
|
|
|
open (STDERR, ">&STDOUT") unless $command[0] eq 'svn'; |
|
|
|
|
|
|
|
|
|
# Call internal function, name given by $command[1] |
|
|
|
|
if($command[0] eq 'kdesrc-build') |
|
|
|
|
@ -5573,8 +5576,8 @@ sub prepend_environment_path |
|
|
|
|
# Filter out entries to add that are already in the environment from the |
|
|
|
|
# system. |
|
|
|
|
for my $path (grep { list_has(@curPaths, $_) } (@_) ) { |
|
|
|
|
whisper "\tNot prepending y[$path] to y[$envName] as it appears " . |
|
|
|
|
"to already be defined in y[$envName]."; |
|
|
|
|
debug "\tNot prepending y[$path] to y[$envName] as it appears " . |
|
|
|
|
"to already be defined in y[$envName]."; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@_ = grep { not list_has(@curPaths, $_); } (@_); |
|
|
|
|
|