mbnames: fix the filename extension for the intermediate files

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-07-06 01:15:33 +02:00
parent b3209e38c0
commit 175479d919

View File

@ -43,11 +43,13 @@ def add(accountname, folder_root, foldername):
with _mbLock: with _mbLock:
_mbnames.addAccountFolder(accountname, folder_root, foldername) _mbnames.addAccountFolder(accountname, folder_root, foldername)
def init(conf, ui, dry_run): def init(conf, ui, dry_run):
global _mbnames global _mbnames
if _mbnames is None: if _mbnames is None:
_mbnames = _Mbnames(conf, ui, dry_run) _mbnames = _Mbnames(conf, ui, dry_run)
def prune(accounts): def prune(accounts):
global _mbnames global _mbnames
if _mbnames.is_enabled() is True: if _mbnames.is_enabled() is True:
@ -55,6 +57,7 @@ def prune(accounts):
else: else:
_mbnames.pruneAll(accounts) _mbnames.pruneAll(accounts)
def write(): def write():
"""Write the mbnames file.""" """Write the mbnames file."""
@ -65,6 +68,7 @@ def write():
if _mbnames.get_incremental() is not True: if _mbnames.get_incremental() is not True:
_mbnames.write() _mbnames.write()
def writeIntermediateFile(accountname): def writeIntermediateFile(accountname):
"""Write intermediate mbnames file.""" """Write intermediate mbnames file."""
@ -87,7 +91,7 @@ class _IntermediateMbnames(object):
self._accountname = accountname self._accountname = accountname
self._folder_root = folder_root self._folder_root = folder_root
self._folderfilter = folderfilter self._folderfilter = folderfilter
self._path = path.join(mbnamesdir, "%s.yml"% accountname) self._path = path.join(mbnamesdir, "%s.json"% accountname)
self._dryrun = dry_run self._dryrun = dry_run
def add(self, foldername): def add(self, foldername):