fixing a badly resolved conflict from a --rebase

daviddavis · Aug 12, 2011 · d58ed82 · d58ed82
1 parent a9b403f
commit d58ed82
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cli/src/katello/client/config.py b/cli/src/katello/client/config.py
@@ -62,8 +62,9 @@ def __init__(self):
 
         # read global configuration first
         Config.parser.readfp(open(Config.PATH, 'r'), Config.PATH)
-        if os.path.exists(Config.USER):
-            Config.parser.readfp(open(Config.USER, 'r'), Config.USER)
+
+        # read user config if it exists
+        Config.parser.read(Config.USER)
 
     @staticmethod
     def save():
@@ -73,5 +74,5 @@ def save():
         if not Config.parser:
             raise Exception('Config.parser has not been initialized.')
 
-        # only writes to /etc/katello/client.conf
-        Config.parser.write(open(Config.PATH, 'w'))
+        # only writes to ~/.katello/client.conf
+        Config.parser.write(open(Config.USER, 'w'))