From 63f311eea492433b5a12ac685907b5d49105c44f Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Tue, 5 Jan 2016 13:16:49 +0200
Subject: [PATCH] Refactored the checking method to be easier to read

---
 letsencrypt-apache/letsencrypt_apache/parser.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/parser.py b/letsencrypt-apache/letsencrypt_apache/parser.py
index 04b61b2d4..23ca05ae0 100644
--- a/letsencrypt-apache/letsencrypt_apache/parser.py
+++ b/letsencrypt-apache/letsencrypt_apache/parser.py
@@ -500,18 +500,19 @@ class ApacheParser(object):
         """
 
         try:
-            use_new = False
-            remove_old = False
             new_file_match = os.path.basename(filepath)
             existing_match = self.parser_paths[os.path.dirname(filepath)]
-            if existing_match == new_file_match:
-                # True here to let augeas verify that the path is parsed
-                use_new = True
-            elif new_file_match == "*":
+            if existing_match == "*":
+                use_new = False
+            else:
                 use_new = True
+            if new_file_match == "*":
                 remove_old = True
+            else:
+                remove_old = False
         except KeyError:
             use_new = True
+            remove_old = False
         return use_new, remove_old
 
     def _remove_httpd_transform(self, filepath):