Commit acde1d33 authored by Frederik Gladhorn's avatar Frederik Gladhorn Committed by Jędrzej Nowacki
Browse files

Fix submodule merge script


Submodules that have no changes actually show up with space in front of
the sha-1 which would mess up the logic when splitting by spaces.

Change-Id: I15506c6e3780efb29d885ff456ecfac60526c03d
Reviewed-by: default avatarJędrzej Nowacki <jedrzej.nowacki@digia.com>
parent 2c2b3aa5
No related merge requests found
Showing with 4 additions and 1 deletion
......@@ -184,7 +184,7 @@ def get_submodules():
modules = []
modules_not_checked_out = []
for line in git_submodule_status.split('\n'):
module = line.split(' ')[1]
module = line.strip().split(' ')[1]
if line[0] == '-':
modules_not_checked_out += [module]
print('WARNING:', module, 'is not checked out')
......@@ -200,6 +200,9 @@ if __name__== "__main__":
print("Qt Project merge tool\n")
default_modules, modules_not_checked_out = get_submodules()
print("Submodules: ", default_modules)
print("Ignored submodules: ", modules_not_checked_out)
class Config(object): pass
config = Config()
import argparse
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment