equal
deleted
inserted
replaced
95 self.cnx = cnx |
95 self.cnx = cnx |
96 self.repo = repo |
96 self.repo = repo |
97 self.session = cnx._session |
97 self.session = cnx._session |
98 elif connect: |
98 elif connect: |
99 self.repo_connect() |
99 self.repo_connect() |
100 self.set_session() |
100 self.set_cnx() |
101 else: |
101 else: |
102 self.session = None |
102 self.session = None |
103 # no config on shell to a remote instance |
103 # no config on shell to a remote instance |
104 if config is not None and (cnx or connect): |
104 if config is not None and (cnx or connect): |
105 repo = self.repo |
105 repo = self.repo |
123 if insert_lperms: |
123 if insert_lperms: |
124 config._cubes = cubes |
124 config._cubes = cubes |
125 self.fs_schema = schema |
125 self.fs_schema = schema |
126 self._synchronized = set() |
126 self._synchronized = set() |
127 |
127 |
128 def set_session(self): |
128 def set_cnx(self): |
129 try: |
129 try: |
130 login = self.repo.config.default_admin_config['login'] |
130 login = self.repo.config.default_admin_config['login'] |
131 pwd = self.repo.config.default_admin_config['password'] |
131 pwd = self.repo.config.default_admin_config['password'] |
132 except KeyError: |
132 except KeyError: |
133 login, pwd = manager_userpasswd() |
133 login, pwd = manager_userpasswd() |
147 login, pwd = manager_userpasswd() |
147 login, pwd = manager_userpasswd() |
148 except (KeyboardInterrupt, EOFError): |
148 except (KeyboardInterrupt, EOFError): |
149 print 'aborting...' |
149 print 'aborting...' |
150 sys.exit(0) |
150 sys.exit(0) |
151 self.session = self.repo._get_session(self.cnx.sessionid) |
151 self.session = self.repo._get_session(self.cnx.sessionid) |
152 self.session.keep_cnxset_mode('transaction') |
|
153 |
152 |
154 # overriden from base MigrationHelper ###################################### |
153 # overriden from base MigrationHelper ###################################### |
155 |
154 |
156 @cached |
155 @cached |
157 def repo_connect(self): |
156 def repo_connect(self): |