1berry/qt5
1
0
Fork 0
Code Issues Pull Requests Actions 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
Pick-to: 6.1
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
This commit is contained in:
Paul Wicking 2021-02-08 12:59:02 +01:00
parent a36ec0c66b
commit 414165e366
1 changed files with 6 additions and 1 deletions
Show Stats 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_ADDON => 3,
STS_DEPRECATED => 4,
STS_OBSOLETE => 5
STS_OBSOLETE => 5,
STS_ADDITIONAL => 6
};
sub git_clone_all_submodules
@ -332,6 +333,8 @@ sub git_clone_all_submodules
$subinits{$1} = STS_DEPRECATED;
} elsif ($3 eq "obsolete") {
$subinits{$1} = STS_OBSOLETE;
} elsif ($3 eq "additionalLibrary") {
$subinits{$1} = STS_ADDITIONAL;
} elsif ($3 eq "ignore") {
delete $subinits{$1};
} else {
@ -351,6 +354,8 @@ sub git_clone_all_submodules
@what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
} elsif ($mod eq "addon") {
@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") {
@what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
} elsif ($mod eq "deprecated") {