From 5fa912b0d148cf92f72640ac7dcff98c5db11853 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Thu, 14 Apr 2022 14:41:13 +0000 Subject: Stop passing optparse.Values to git_superproject Make git_superproject independent of the command line by passing the specific value instead of requiring the caller to have an optparse.Values object to pass in. Flag --use-superproject and --archive as incompatible in subcmds/init.py Change-Id: Ied7c874b312e151038df903c8af4328f070f387c Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/335135 Tested-by: LaMont Jones Reviewed-by: Raman Tenneti Reviewed-by: Mike Frysinger --- subcmds/init.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'subcmds/init.py') diff --git a/subcmds/init.py b/subcmds/init.py index 99f30dce..0388f5d1 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -260,6 +260,9 @@ to update the working directory files. if opt.use_superproject is not None: self.OptionParser.error('--mirror and --use-superproject cannot be ' 'used together.') + if opt.archive and opt.use_superproject is not None: + self.OptionParser.error('--archive and --use-superproject cannot be used ' + 'together.') if opt.standalone_manifest and (opt.manifest_branch or opt.manifest_name != 'default.xml'): -- cgit v1.2.3-54-g00ecf