Make addition of conflicting flags look similar

2026-07-27 08:09:10 +02:00 · 2016-01-29 18:04:51 -08:00
parent 5c363b5b98
commit 29bed26aa1
1 changed files with 1 additions and 2 deletions
@@ -850,8 +850,7 @@ class HelpfulArgumentParser(object):
            if (parsed_args.server not in
                    (flag_default("server"), constants.STAGING_URI)):
                conflicts = ["--staging"] if parsed_args.staging else []
-                if parsed_args.dry_run:
-                    conflicts.append("--dry-run")
+                conflicts += ["--dry-run"] if parsed_args.dry_run else []
                raise errors.Error("--server value conflicts with {0}".format(
                    " and ".join(conflicts)))