--- XCPF/PacmanConfig.py    2018-12-24 02:47:27.000000000 +0100
+++ ../fix/XCPF/PacmanConfig.py 2019-01-18 16:19:22.264851002 +0100
@@ -25,7 +25,7 @@
 ################################################################################

 from collections import OrderedDict
-from pycman.config import pacman_conf_enumerator, _logmask, cb_log, LIST_OPTIONS, BOOLEAN_OPTIONS
+from pycman.config import PacmanConfEnumeratorSession, _logmask, cb_log, LIST_OPTIONS, BOOLEAN_OPTIONS
 import os
 import pyalpm

@@ -51,31 +51,32 @@
       self.load_from_options(options)

   def load_from_file(self, filename):
-    for section, key, value in pacman_conf_enumerator(filename):
-      if key == 'Architecture' and value == 'auto':
-        continue
-      elif key == 'Color':
-        self[section][key] = 'auto'
-        continue
-      self.setdefault(section, OrderedDict())
-      if key in LIST_OPTIONS:
-        self[section].setdefault(key, []).append(value)
-      else:
-        self[section][key] = value
-    if "CacheDir" not in self.options:
-      self.options["CacheDir"]= ["/var/cache/pacman/pkg"]
-    for key, value in self.items():
-      # For backwards compabilitility
-      if key != 'options':
-        self.repos[key] = self[key]['Server']
-
-        if 'LocalFileSigLevel' not in value:
-          value['LocalFileSigLevel'] = self.options['SigLevel']
-        if 'RemoteFileSigLevel' not in value:
-          value['RemoteFileSigLevel'] = self.options['SigLevel']
+    with PacmanConfEnumeratorSession(filename) as pacman_conf_enumerator:
+      for section, key, value in pacman_conf_enumerator():
+        if key == 'Architecture' and value == 'auto':
+          continue
+        elif key == 'Color':
+          self[section][key] = 'auto'
+          continue
+        self.setdefault(section, OrderedDict())
+        if key in LIST_OPTIONS:
+          self[section].setdefault(key, []).append(value)
+        else:
+          self[section][key] = value
+      if "CacheDir" not in self.options:
+        self.options["CacheDir"]= ["/var/cache/pacman/pkg"]
+      for key, value in self.items():
+        # For backwards compabilitility
+        if key != 'options':
+          self.repos[key] = self[key]['Server']
+
+          if 'LocalFileSigLevel' not in value:
+            value['LocalFileSigLevel'] = self.options['SigLevel']
+          if 'RemoteFileSigLevel' not in value:
+            value['RemoteFileSigLevel'] = self.options['SigLevel']

-      if 'SigLevel' not in value:
-        value['SigLevel'] = self.options['SigLevel']
+        if 'SigLevel' not in value:
+          value['SigLevel'] = self.options['SigLevel']

   def load_from_options(self, options):
     global _logmask
@@ -90,7 +91,7 @@
     if options.logfile is not None:
       self.options["LogFile"] = options.logfile
     if options.cachedir is not None:
-      self.options["CacheDir"] = [option.cachedir]
+      self.options["CacheDir"] = [options.cachedir]
     if options.debug:
       _logmask = 0xffff