From c972396ecccb4b67eafc038a482ffeaa1df2c93e Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 3 May 2013 14:46:52 -0700
Subject: A few more tests + cleanings.

---
 cloudinit/mergers/m_list.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cloudinit')

diff --git a/cloudinit/mergers/m_list.py b/cloudinit/mergers/m_list.py
index 50f279e8..34b32379 100644
--- a/cloudinit/mergers/m_list.py
+++ b/cloudinit/mergers/m_list.py
@@ -16,13 +16,16 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+DEF_MERGE_TYPE = 'replace'
+MERGE_TYPES = ('append', 'prepend', DEF_MERGE_TYPE,)
+
 
 class Merger(object):
     def __init__(self, merger, opts):
         self._merger = merger
         # Affects merging behavior...
-        self._method = 'replace'
-        for m in ['append', 'prepend', 'replace']:
+        self._method = DEF_MERGE_TYPE
+        for m in MERGE_TYPES:
             if m in opts:
                 self._method = m
                 break
-- 
cgit v1.2.3