From 20bca1942033c2c0164fd7b98be9243b323c7067 Mon Sep 17 00:00:00 2001
From: Eccenux <eccenux+git@gmail.com>
Date: Thu, 30 Nov 2017 20:24:49 +0100
Subject: [PATCH 1/3] Show a diff when re-creating certificate instead of full
 list of domains #5274

---
 certbot/main.py | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/certbot/main.py b/certbot/main.py
index 9e2850891..11f7ddab7 100644
--- a/certbot/main.py
+++ b/certbot/main.py
@@ -253,18 +253,39 @@ def _find_lineage_for_domains_and_certname(config, domains, certname):
                     "Use -d to specify domains, or run certbot --certificates to see "
                     "possible certificate names.".format(certname))
 
+def _get_added_removed(after, before):
+    """Get lists of items removed from `before` 
+    and a lists of items added to `after`
+    """
+    added = list(set(after) - set(before))
+    removed = list(set(before) - set(after))
+    added.sort()
+    removed.sort()
+    return added, removed
+
+def _format_list(character, list):
+    """Format list with given character
+    """
+    formatted = "{br}{ch} " + "{br}{ch} ".join(list)
+    return formatted.format(
+        ch=character,
+        br=os.linesep
+    )
+
 def _ask_user_to_confirm_new_names(config, new_domains, certname, old_domains):
     """Ask user to confirm update cert certname to contain new_domains.
     """
     if config.renew_with_new_domains:
         return
 
-    msg = ("You are updating certificate {0} to include domains: {1}{br}{br}"
-           "It previously included domains: {2}{br}{br}"
+    added, removed = _get_added_removed(new_domains, old_domains)
+
+    msg = ("You are updating certificate {0} to include new domain(s): {1}{br}{br}"
+           "You are also removing previously included domain(s): {2}{br}{br}"
            "Did you intend to make this change?".format(
                certname,
-               ", ".join(new_domains),
-               ", ".join(old_domains),
+               _format_list("+", added),
+               _format_list("-", removed),
                br=os.linesep))
     obj = zope.component.getUtility(interfaces.IDisplay)
     if not obj.yesno(msg, "Update cert", "Cancel", default=True):

From abdde886fa3d6361336a2fb1d7e091b53be4b6f2 Mon Sep 17 00:00:00 2001
From: Eccenux <eccenux+git@gmail.com>
Date: Sat, 2 Dec 2017 12:25:58 +0100
Subject: [PATCH 2/3] code style

---
 certbot/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/certbot/main.py b/certbot/main.py
index 11f7ddab7..cee381cbd 100644
--- a/certbot/main.py
+++ b/certbot/main.py
@@ -254,7 +254,7 @@ def _find_lineage_for_domains_and_certname(config, domains, certname):
                     "possible certificate names.".format(certname))
 
 def _get_added_removed(after, before):
-    """Get lists of items removed from `before` 
+    """Get lists of items removed from `before`
     and a lists of items added to `after`
     """
     added = list(set(after) - set(before))

From 840c94371111ead7f20be925688ad2fb6d931551 Mon Sep 17 00:00:00 2001
From: Eccenux <eccenux+git@gmail.com>
Date: Sat, 2 Dec 2017 12:28:53 +0100
Subject: [PATCH 3/3] W:266,28: Redefining built-in 'list' (redefined-builtin)

---
 certbot/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/certbot/main.py b/certbot/main.py
index cee381cbd..f61c70b05 100644
--- a/certbot/main.py
+++ b/certbot/main.py
@@ -263,10 +263,10 @@ def _get_added_removed(after, before):
     removed.sort()
     return added, removed
 
-def _format_list(character, list):
+def _format_list(character, strings):
     """Format list with given character
     """
-    formatted = "{br}{ch} " + "{br}{ch} ".join(list)
+    formatted = "{br}{ch} " + "{br}{ch} ".join(strings)
     return formatted.format(
         ch=character,
         br=os.linesep