Merge pull request #149 from SUSE/new-osc-conf-format

Support for new OSC config
SUSE · Dec 11, 2023 · 04d772f · 04d772f
2 parents f94f372 + 8e2ec87
commit 04d772f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/osctiny/utils/conf.py b/osctiny/utils/conf.py
@@ -199,7 +199,12 @@ def get_cookie_jar() -> typing.Optional[LWPCookieJar]:
     .. versionadded:: 0.8.0
     """
     if _conf is not None:
-        path = _conf._identify_osccookiejar()  # pylint: disable=protected-access
+        try:
+            # New OSC config
+            path = _conf.config.cookiejar
+        except AttributeError:
+            # Backward compatibility to old OSC config style
+            path = _conf._identify_osccookiejar()  # pylint: disable=protected-access
         if os.path.isfile(path):
             return LWPCookieJar(filename=path)