Change db.py to always read config files correctly. And close files.
Signed-off-by: showard@google.com
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1257 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tko/db.py b/tko/db.py
index 15173da..d81b237 100644
--- a/tko/db.py
+++ b/tko/db.py
@@ -10,10 +10,13 @@
try:
file = os.path.join(path, '.database')
db_prefs = open(file, 'r')
+ file_host = db_prefs.readline().rstrip()
+ file_database = db_prefs.readline().rstrip()
if not host:
- host = db_prefs.readline().rstrip()
+ host = file_host
if not database:
- database = db_prefs.readline().rstrip()
+ database = file_database
+ db_prefs.close()
except:
if not host:
host = 'localhost'
@@ -23,18 +26,24 @@
try:
file = os.path.join(path, '.priv_login')
login = open(file, 'r')
+ file_user = login.readline().rstrip()
+ file_password = login.readline().rstrip()
if not user:
- user = login.readline().rstrip()
+ user = file_user
if not password:
- password = login.readline().rstrip()
+ password = file_password
+ login.close()
except:
try:
file = os.path.join(path, '.unpriv_login')
login = open(file, 'r')
+ file_user = login.readline().rstrip()
+ file_password = login.readline().rstrip()
if not user:
- user = login.readline().rstrip()
+ user = file_user
if not password:
- password = login.readline().rstrip()
+ password = file_password
+ login.close()
except:
if not user:
user = 'nobody'