From 29bed26aa14bdb71b8ce388a01eadb14a5e1dda5 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Fri, 29 Jan 2016 18:04:51 -0800
Subject: [PATCH] Make addition of conflicting flags look similar

---
 letsencrypt/cli.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index db8cd722d..6f9d9dbc7 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -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)))