lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 03:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix init-repository

Browse Source 
Introducing additionalLibrary to .gitmodules
broke init-repository. Add the new state also
here.

Task-number: QTBUG-90669
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 414165e366)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Paul Wicking
2021-02-08 12:59:02 +01:00
committed by Qt Cherry-pick Bot
parent 117bdd9867
commit 4bcbf25951
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
init-repository
View File

@@ -294,7 +294,8 @@ use constant {
STS_ESSENTIAL => 2, STS_ESSENTIAL => 2,
STS_ADDON => 3, STS_ADDON => 3,
STS_DEPRECATED => 4, STS_DEPRECATED => 4,
STS_OBSOLETE => 5 STS_OBSOLETE => 5,
STS_ADDITIONAL => 6
}; };
sub git_clone_all_submodules sub git_clone_all_submodules
@@ -332,6 +333,8 @@ sub git_clone_all_submodules
$subinits{$1} = STS_DEPRECATED; $subinits{$1} = STS_DEPRECATED;
} elsif ($3 eq "obsolete") { } elsif ($3 eq "obsolete") {
$subinits{$1} = STS_OBSOLETE; $subinits{$1} = STS_OBSOLETE;
} elsif ($3 eq "additionalLibrary") {
$subinits{$1} = STS_ADDITIONAL;
} elsif ($3 eq "ignore") { } elsif ($3 eq "ignore") {
delete $subinits{$1}; delete $subinits{$1};
} else { } else {
@@ -351,6 +354,8 @@ sub git_clone_all_submodules
@what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; @what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
} elsif ($mod eq "addon") { } elsif ($mod eq "addon") {
@what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; @what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
} elsif ($mod eq "additionalLibrary") {
@what = grep { ($subinits{$_} || 0) eq STS_ADDITIONAL } keys %subbases;
} elsif ($mod eq "preview") { } elsif ($mod eq "preview") {
@what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; @what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
} elsif ($mod eq "deprecated") { } elsif ($mod eq "deprecated") {