diff -r e4532c6acf34 -r e22bd5eb6ffd server/serverconfig.py --- a/server/serverconfig.py Wed Nov 03 10:12:16 2010 +0100 +++ b/server/serverconfig.py Thu Nov 04 10:58:29 2010 +0100 @@ -297,7 +297,12 @@ _sconfig = SourceConfiguration( self, options=SOURCE_TYPES['native'].options) for attr, val in sconfig.items(): - _sconfig.set_option(attr, val) + try: + _sconfig.set_option(attr, val) + except lgconfig.OptionError: + # skip adapter, may be present on pre 3.10 instances + if attr != 'adapter': + self.error('skip unknown option %s in sources file') sconfig = _sconfig print >> stream, '[%s]' % section print >> stream, generate_source_config(sconfig)