diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-10-19 10:58:52 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 03:26:39 +0200 |
| commit | 857b5cb3cde6bcdd0d31e4a0f2944dc5ac1b883e (patch) | |
| tree | eeb49932256d38938c3f572282ee44857e1b2927 /scripts/qt | |
| parent | 3d52066bae00ad39025fab706b27f9d44fdb176a (diff) | |
qt_update_submodules: removed Nokia-specific arguments
Removed usage of -(brisbane-)nokia-developer.
To use a git mirror, instead put "--mirror <something>" in
qtqa.qt.init-repository.args.
Change-Id: I389d5a7f3c7282446a26b037f12799964b83ba77
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qt_update_submodules.pl | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/scripts/qt/qt_update_submodules.pl b/scripts/qt/qt_update_submodules.pl index 1f50fdc2..52dc8e58 100755 --- a/scripts/qt/qt_update_submodules.pl +++ b/scripts/qt/qt_update_submodules.pl @@ -62,9 +62,6 @@ use autodie; Readonly my @PROPERTIES => ( q{base.dir} => q{top-level source directory of Qt}, - q{location} => q{location hint for git mirrors (`oslo' or `brisbane'); } - . q{only useful inside of Nokia LAN}, - q{qt.git.push} => q{if 1, really push the commit (if any)}, q{qt.git.push.dry-run} => q{if 1, do a dry-run push (only used if qt.git.push is set)}, @@ -110,7 +107,6 @@ sub read_and_store_configuration $self->read_and_store_properties( 'base.dir' => \&QtQA::TestScript::default_common_property, - 'location' => \&QtQA::TestScript::default_common_property, 'qt.git.push' => 0, 'qt.git.push.dry-run' => 0, 'qt.git.url' => 'ssh://qt_submodule_update_bot@codereview.qt-project.org:29418/qt/qt5', @@ -141,19 +137,11 @@ sub run_init_repository my ($self) = @_; my $base_dir = $self->{ 'base.dir' }; - my $location = $self->{ 'location' }; my $args = $self->{ 'qt.init-repository.args' }; chdir $base_dir; my @init_repository_arguments = ( '-force' ); - if (defined( $location ) && ($location eq 'brisbane')) { - push @init_repository_arguments, '-brisbane-nokia-developer'; - } - elsif (defined( $location )) { - push @init_repository_arguments, '-nokia-developer'; - } - push @init_repository_arguments, (split /\s+/, $args); $self->exe( 'perl', './init-repository', @init_repository_arguments ); |