1 --- a/swarmlib/connect/__init__.py Sat Apr 05 21:13:51 2008 -0400
2 +++ b/swarmlib/connect/__init__.py Sat Apr 05 21:17:01 2008 -0400
3 @@ -30,7 +30,7 @@
4 '' : Local
5 }
6
7 -def get_connection(parsed_url, log):
8 +def get_connection(parsed_url, log, force=False):
9 """
10 Given a scheme_classifer (typically, as determined by urlparse), return
11 a scheme object which can handle it.
12 @@ -39,7 +39,8 @@
13 scheme_classifer = parsed_url.scheme.lower()
14
15 if scheme_classifer in __scheme_lookup.keys():
16 - return __scheme_lookup[scheme_classifer](parsed_url, config, log)
17 + return __scheme_lookup[scheme_classifer](parsed_url, config, log,
18 + force)
19 else:
20 raise SchemeNotFoundError(_("'%s' scheme not defined.") %
21 scheme_classifer)
1.1 --- a/swarmlib/hive.py Sat Apr 05 21:13:51 2008 -0400
1.2 +++ b/swarmlib/hive.py Sat Apr 05 21:17:01 2008 -0400
1.3 @@ -25,7 +25,7 @@
1.4 import urlparse
1.5
1.6 class Hive(object):
1.7 - def __init__(self, url, log, config=None):
1.8 + def __init__(self, url, log, Force=False, config=None):
1.9 """
1.10 Basic URL parsing wrapper class
1.11 Accessable members:
1.12 @@ -56,6 +56,8 @@
1.13 self.connection = None
1.14 self._log = log
1.15 self._alt_config_file = config
1.16 + self.config = None
1.17 + self.force = force
1.18 self._logger = log.get_logger("Hive")
1.19
1.20 def init(self, force=False, ):
1.21 @@ -70,8 +72,11 @@
1.22 Returns nothing on success, otherwise raises an exception.
1.23 """
1.24 try:
1.25 - self.connection = connect.get_connection(self._parsed, self._log)
1.26 + self.connection = connect.get_connection(self._parsed, self._log,
1.27 + self.force)
1.28 except:
1.29 pass
1.30
1.31 + self.config = self.connection.get_config()
1.32 +
1.33 self.connected = True