Revert "fix check for unsupported sep character"
This reverts commit 4208fd4a15
.
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
parent
50cfab5ba2
commit
1e4990524e
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (C) 2003-2019 John Goerzen & contributors
|
# Copyright (C) 2003-2016 John Goerzen & contributors
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
@ -385,24 +385,24 @@ class SyncableAccount(Account):
|
||||||
"[%s]"% (remotefolder.getname(), remoterepos))
|
"[%s]"% (remotefolder.getname(), remoterepos))
|
||||||
continue # Ignore filtered folder.
|
continue # Ignore filtered folder.
|
||||||
|
|
||||||
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
|
# The remote folder names must not have the local sep char in
|
||||||
# their names since this would cause troubles while converting
|
# their names since this would cause troubles while converting
|
||||||
# the name back (from local to remote).
|
# the name back (from local to remote).
|
||||||
sep = localrepos.getsep()
|
sep = localrepos.getsep()
|
||||||
if (sep == os.path.sep or
|
if (sep != os.path.sep and
|
||||||
sep == remoterepos.getsep() or
|
sep != remoterepos.getsep() and
|
||||||
sep in remotefolder.getname()):
|
sep in remotefolder.getname()):
|
||||||
self.ui.warn('', "Ignoring folder '%s' due to unsupported "
|
self.ui.warn('', "Ignoring folder '%s' due to unsupported "
|
||||||
"'%s' character serving as local separator."%
|
"'%s' character serving as local separator."%
|
||||||
(remotefolder.getname(), localrepos.getsep()))
|
(remotefolder.getname(), localrepos.getsep()))
|
||||||
continue # Ignore unsupported folder name.
|
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.
|
||||||
|
|
||||||
if not globals.options.singlethreading:
|
if not globals.options.singlethreading:
|
||||||
thread = InstanceLimitedThread(
|
thread = InstanceLimitedThread(
|
||||||
limitNamespace="%s%s"% (
|
limitNamespace="%s%s"% (
|
||||||
|
|
Loading…
Reference in New Issue