diff options
Diffstat (limited to 'subcmds/init.py')
-rw-r--r-- | subcmds/init.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/subcmds/init.py b/subcmds/init.py index a3f3241a..1fbe4654 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
@@ -478,8 +478,13 @@ to update the working directory files. | |||
478 | 478 | ||
479 | # Check this here, else manifest will be tagged "not new" and init won't be | 479 | # Check this here, else manifest will be tagged "not new" and init won't be |
480 | # possible anymore without removing the .repo/manifests directory. | 480 | # possible anymore without removing the .repo/manifests directory. |
481 | if opt.archive and opt.mirror: | 481 | if opt.mirror: |
482 | self.OptionParser.error('--mirror and --archive cannot be used together.') | 482 | if opt.archive: |
483 | self.OptionParser.error('--mirror and --archive cannot be used ' | ||
484 | 'together.') | ||
485 | if opt.use_superproject is not None: | ||
486 | self.OptionParser.error('--mirror and --use-superproject cannot be ' | ||
487 | 'used together.') | ||
483 | 488 | ||
484 | if opt.standalone_manifest and ( | 489 | if opt.standalone_manifest and ( |
485 | opt.manifest_branch or opt.manifest_name != 'default.xml'): | 490 | opt.manifest_branch or opt.manifest_name != 'default.xml'): |