fix check for unsupported sep character

Introduced by 6b28071 but could not work.

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2019-10-03 23:56:54 +02:00
parent 0b18cb5e73
commit 4208fd4a15
1 changed files with 13 additions and 13 deletions

View File

@ -1,4 +1,4 @@
# Copyright (C) 2003-2016 John Goerzen & contributors
# Copyright (C) 2003-2019 John Goerzen & contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -385,24 +385,24 @@ class SyncableAccount(Account):
"[%s]"% (remotefolder.getname(), remoterepos))
continue # Ignore filtered folder.
# The remote folder names must not have the local sep char in
# their names since this would cause troubles while converting
# the name back (from local to remote).
sep = localrepos.getsep()
if (sep != os.path.sep and
sep != remoterepos.getsep() and
sep in remotefolder.getname()):
self.ui.warn('', "Ignoring folder '%s' due to unsupported "
"'%s' character serving as local separator."%
(remotefolder.getname(), localrepos.getsep()))
continue # Ignore unsupported folder name.
localfolder = self.get_local_folder(remotefolder)
if not localfolder.sync_this:
self.ui.debug('', "Not syncing filtered folder '%s'"
"[%s]"% (localfolder.getname(), localfolder.repository))
continue # Ignore filtered folder.
# The remote folder names must not have the local sep char in
# their names since this would cause troubles while converting
# the name back (from local to remote).
sep = localrepos.getsep()
if (sep == os.path.sep or
sep == remoterepos.getsep() or
sep in remotefolder.getname()):
self.ui.warn('', "Ignoring folder '%s' due to unsupported "
"'%s' character serving as local separator."%
(remotefolder.getname(), localrepos.getsep()))
continue # Ignore unsupported folder name.
if not globals.options.singlethreading:
thread = InstanceLimitedThread(
limitNamespace="%s%s"% (