diff options
Diffstat (limited to 'subcmds/init.py')
| -rw-r--r-- | subcmds/init.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/subcmds/init.py b/subcmds/init.py index 1fbe4654..e2f34cc8 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | import os | 15 | import os |
| 16 | import platform | 16 | import platform |
| 17 | import re | 17 | import re |
| 18 | import subprocess | ||
| 19 | import sys | 18 | import sys |
| 20 | import urllib.parse | 19 | import urllib.parse |
| 21 | 20 | ||
| @@ -132,8 +131,8 @@ to update the working directory files. | |||
| 132 | 'cannot be re-initialized without --manifest-url/-u') | 131 | 'cannot be re-initialized without --manifest-url/-u') |
| 133 | sys.exit(1) | 132 | sys.exit(1) |
| 134 | 133 | ||
| 135 | if opt.standalone_manifest or ( | 134 | if opt.standalone_manifest or (was_standalone_manifest and |
| 136 | was_standalone_manifest and opt.manifest_url): | 135 | opt.manifest_url): |
| 137 | m.config.ClearCache() | 136 | m.config.ClearCache() |
| 138 | if m.gitdir and os.path.exists(m.gitdir): | 137 | if m.gitdir and os.path.exists(m.gitdir): |
| 139 | platform_utils.rmtree(m.gitdir) | 138 | platform_utils.rmtree(m.gitdir) |
| @@ -486,8 +485,8 @@ to update the working directory files. | |||
| 486 | self.OptionParser.error('--mirror and --use-superproject cannot be ' | 485 | self.OptionParser.error('--mirror and --use-superproject cannot be ' |
| 487 | 'used together.') | 486 | 'used together.') |
| 488 | 487 | ||
| 489 | if opt.standalone_manifest and ( | 488 | if opt.standalone_manifest and (opt.manifest_branch or |
| 490 | opt.manifest_branch or opt.manifest_name != 'default.xml'): | 489 | opt.manifest_name != 'default.xml'): |
| 491 | self.OptionParser.error('--manifest-branch and --manifest-name cannot' | 490 | self.OptionParser.error('--manifest-branch and --manifest-name cannot' |
| 492 | ' be used with --standalone-manifest.') | 491 | ' be used with --standalone-manifest.') |
| 493 | 492 | ||
