diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2021-02-08 12:59:02 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-09 06:38:17 +0000 |
| commit | 4bcbf2595188b4445d9f786bcabc14ca910f1e4f (patch) | |
| tree | 8407ab432c269158c07cb09d1b3c79d034e4d3be | |
| parent | 117bdd98673a7db6c6e8ff79745447efbff68941 (diff) | |
Fix init-repository
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 414165e36614dc0f0267df280ea892e1914f1776)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | init-repository | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/init-repository b/init-repository index 2e0ddcde..63005fd2 100755 --- a/init-repository +++ b/init-repository @@ -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") { |