diff --git a/e_uae_wrapper/archive.py b/e_uae_wrapper/archive.py index 9d72255..a6dd209 100644 --- a/e_uae_wrapper/archive.py +++ b/e_uae_wrapper/archive.py @@ -53,7 +53,7 @@ class Wrapper(base.ArchiveBase): """ Produce archive and save it back. Than remove old one. """ - if self.all_options.get('wrapper_persist_data', '0') != '1': + if self.config.get('wrapper_persist_data', '0') != '1': return True curdir = os.path.abspath('.') @@ -62,7 +62,7 @@ class Wrapper(base.ArchiveBase): saves = self._get_saves_dir() if saves: shutil.rmtree(saves) - os.unlink('Config.e-uae') + os.unlink('.uaerc') title = self._get_title() diff --git a/e_uae_wrapper/base.py b/e_uae_wrapper/base.py index 64a8a12..c012b6d 100644 --- a/e_uae_wrapper/base.py +++ b/e_uae_wrapper/base.py @@ -3,18 +3,23 @@ Base class for all wrapper modules """ import logging import os +import re import shutil import sys import tempfile from e_uae_wrapper import utils from e_uae_wrapper import path +from e_uae_wrapper import WRAPPER_KEY class Base(object): """ Base class for wrapper modules """ + + CONF_RE = re.compile(r'[^{]*(?P