base: Abide specified configpath when writing API key

crobinso · crobinso · commit 4c4873abb2cf · 2020-01-08T17:50:53.000-05:00
Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_authfiles.py b/bugzilla/_authfiles.py
@@ -107,15 +107,18 @@ def _default_config_location(filename):
     return _default_location(filename, 'config')
 
 
-def _save_api_key(url, api_key):
+def _save_api_key(url, api_key, configpaths):
     """
     Save the API_KEY in the config file.
 
     If tokenfile and cookiefile are undefined, it means that the
     API was called with --no-cache-credentials and no change will be
     made
     """
-    config_filename = _default_config_location('bugzillarc')
+    if configpaths:
+        config_filename = configpaths[0]
+    else:
+        config_filename = _default_config_location('bugzillarc')
     section = _parse_hostname(url)
 
     cfg = ConfigParser()
@@ -124,7 +127,7 @@ def _save_api_key(url, api_key):
     if section not in cfg.sections():
         cfg.add_section(section)
 
-    cfg[section]['api_key'] = api_key.strip()
+    cfg.set(section, 'api_key', api_key.strip())
 
     with open(config_filename, 'w') as configfile:
         cfg.write(configfile)
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -582,13 +582,13 @@ def interactive_login(self, user=None, password=None, force=False,
             log.info('Checking API key... ')
             self.connect()
 
-            if not self.logged_in:
+            if not self.logged_in:  # pragma: no cover
                 raise BugzillaError("Login with API_KEY failed")
             log.info('API Key accepted')
 
-            if self._use_creds:
-                _save_api_key(self.url, self.api_key)
-            else:
+            if self._use_creds or self.configpath:
+                _save_api_key(self.url, self.api_key, self.configpath)
+            else:  # pragma: no cover
                 log.info("API Key won't be updated because use_creds=False")
             return
 
