> Am 25.05.2016 um 18:15 schrieb Axel Rau <axel....@chaos1.de>:
>
> [caldav3:lib/python2.7/site-packages] root# python
> /usr/local/lib/python2.7/site-packages/calendarserver/tools/upgrade.py -s
> Traceback (most recent call last):
> File
> "/usr/local/lib/python2.7/site-packages/calendarserver/tools/upgrade.py",
> line 27, in <module>
> from txdav.common.datastore.sql import CommonDataStore
> File "/usr/local/lib/python2.7/site-packages/txdav/common/datastore/sql.py",
> line 85, in <module>
> from calendarserver.tools.util import displayNameForCollection,
> getEventDetails, agoString
> File "/usr/local/lib/python2.7/site-packages/calendarserver/tools/util.py",
> line 39, in <module>
> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
> File "/usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py",
> line 1831, in <module>
> config.update()
> File "/usr/local/lib/python2.7/site-packages/twistedcaldav/config.py", line
> 262, in update
> hook(self._data, reloading=reloading)
> File "/usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py",
> line 1457, in _postUpdateResourceService
> from twistedcaldav.upgrade import upgradeResourcesXML
> File "/usr/local/lib/python2.7/site-packages/twistedcaldav/upgrade.py", line
> 67, in <module>
> from calendarserver.tap.util import getRootResource, FakeRequest
> File "/usr/local/lib/python2.7/site-packages/calendarserver/tap/util.py",
> line 38, in <module>
> from calendarserver.tools.util import checkDirectory
> ImportError: cannot import name checkDirectory
It seems it dies in config.update (your patch, r15635, in
twistedcaldav/stdconfig.py):
[caldav3:lib/python2.7/site-packages] root# python
/usr/local/lib/python2.7/site-packages/calendarserver/tools/upgrade.py -s
> /usr/local/lib/python2.7/site-packages/calendarserver/tools/util.py(41)<module>()
-> from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
(Pdb) b /usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py:1831
Breakpoint 1 at
/usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py:1831
(Pdb) c
> /usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py(1831)<module>()
-> config.update()
(Pdb) l
1826 config.setProvider(PListConfigProvider(DEFAULT_CONFIG))
1827 config.addPreUpdateHooks(PRE_UPDATE_HOOKS)
1828 config.addPostUpdateHooks(POST_UPDATE_HOOKS)
1829
1830 # Make sure the default config is loaded and updated early on to avoid
race conditions during startup. (upstream: r15635)
1831B-> config.update()
1832
1833 def _preserveConfig(configDict):
1834 """
1835 Preserve certain config keys across reset( ) because these can't be
1836 re-fetched after the process has shed privileges
(Pdb) b 1833
Breakpoint 2 at
/usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py:1833
(Pdb) c
Traceback (most recent call last):
File
"/usr/local/lib/python2.7/site-packages/calendarserver/tools/upgrade.py", line
27, in <module>
from txdav.common.datastore.sql import CommonDataStore
File "/usr/local/lib/python2.7/site-packages/txdav/common/datastore/sql.py",
line 85, in <module>
from calendarserver.tools.util import displayNameForCollection,
getEventDetails, agoString
File "/usr/local/lib/python2.7/site-packages/calendarserver/tools/util.py",
line 41, in <module>
from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
File "/usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py",
line 1831, in <module>
config.update()
File "/usr/local/lib/python2.7/site-packages/twistedcaldav/config.py", line
262, in update
hook(self._data, reloading=reloading)
File "/usr/local/lib/python2.7/site-packages/twistedcaldav/stdconfig.py",
line 1457, in _postUpdateResourceService
from twistedcaldav.upgrade import upgradeResourcesXML
File "/usr/local/lib/python2.7/site-packages/twistedcaldav/upgrade.py", line
67, in <module>
from calendarserver.tap.util import getRootResource, FakeRequest
File "/usr/local/lib/python2.7/site-packages/calendarserver/tap/util.py",
line 38, in <module>
from calendarserver.tools.util import checkDirectory
ImportError: cannot import name checkDirectory
Axel
---
PGP-Key:29E99DD6 ☀ computing @ chaos claudius
_______________________________________________
calendarserver-dev mailing list
calendarserver-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-dev
