From: Oleg Broytman <phd@phdru.name>
Date: Sun, 9 Mar 2014 09:44:35 +0000 (+0400)
Subject: Rename db_file to xsetbg_db_path
X-Git-Tag: v4.1.0~3
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=80c5a31f64e2722657d472191b52589210b7f0d8;p=xsetbg.git

Rename db_file to xsetbg_db_path
---

diff --git a/xsetbg_db.py b/xsetbg_db.py
index c335168..c6a8a3f 100755
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -16,11 +16,11 @@ from xsetbg_conf import xsetbg_conf
 
 db_dirs = []
 try:
-    db_file = xsetbg_conf.get('xsetbg', 'database')
+    xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')
 except:
-    db_file = None
+    xsetbg_db_path = None
 
-if not db_file:
+if not xsetbg_db_path:
     if 'XDG_CACHE_HOME' in os.environ:
         db_dirs.append(os.environ['XDG_CACHE_HOME'])
     home_cache = os.path.expanduser('~/.cache')
@@ -29,14 +29,12 @@ if not db_file:
     db_dirs.append(os.path.dirname(os.path.abspath(__file__)))
 
     for d in db_dirs:
-        db_file = os.path.join(d, 'xsetbg.db')
-        if os.path.exists(db_file):
+        xsetbg_db_path = os.path.join(d, 'xsetbg.db')
+        if os.path.exists(xsetbg_db_path):
             break
     else:
         raise RuntimeError("Cannot find xsetbg.db; searched %s", db_dirs)
 
-xsetbg_db_path = db_file
-
 try:
     xsetbg_db = shelve.open(xsetbg_db_path, 'r')
 except anydbm.error:
@@ -44,4 +42,4 @@ except anydbm.error:
 
 if __name__ == '__main__':
     print "DB dirs:", db_dirs
-    print "DB file:", db_file
+    print "DB file:", xsetbg_db_path