diff options
Diffstat (limited to 'git_superproject.py')
| -rw-r--r-- | git_superproject.py | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/git_superproject.py b/git_superproject.py index 1293f352..07bc2645 100644 --- a/git_superproject.py +++ b/git_superproject.py | |||
| @@ -415,16 +415,26 @@ def _UseSuperprojectFromConfiguration(): | |||
| 415 | return False | 415 | return False |
| 416 | 416 | ||
| 417 | 417 | ||
| 418 | def PrintMessages(opt, manifest): | 418 | def PrintMessages(use_superproject, manifest): |
| 419 | """Returns a boolean if error/warning messages are to be printed.""" | 419 | """Returns a boolean if error/warning messages are to be printed. |
| 420 | return opt.use_superproject is not None or bool(manifest.superproject) | 420 | |
| 421 | Args: | ||
| 422 | use_superproject: option value from optparse. | ||
| 423 | manifest: manifest to use. | ||
| 424 | """ | ||
| 425 | return use_superproject is not None or bool(manifest.superproject) | ||
| 421 | 426 | ||
| 422 | 427 | ||
| 423 | def UseSuperproject(opt, manifest): | 428 | def UseSuperproject(use_superproject, manifest): |
| 424 | """Returns a boolean if use-superproject option is enabled.""" | 429 | """Returns a boolean if use-superproject option is enabled. |
| 430 | |||
| 431 | Args: | ||
| 432 | use_superproject: option value from optparse. | ||
| 433 | manifest: manifest to use. | ||
| 434 | """ | ||
| 425 | 435 | ||
| 426 | if opt.use_superproject is not None: | 436 | if use_superproject is not None: |
| 427 | return opt.use_superproject | 437 | return use_superproject |
| 428 | else: | 438 | else: |
| 429 | client_value = manifest.manifestProject.use_superproject | 439 | client_value = manifest.manifestProject.use_superproject |
| 430 | if client_value is not None: | 440 | if client_value is not None: |
