Allow the script to be run only in the origin directory

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index c335168af45d995f8559c590001fcab8b42b895b..126474a6a7c62721844ce4e3b1035f3baacbad90 100755 (executable)
--- 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,13 +29,9 @@ 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')
@@ -44,4 +40,4 @@ except anydbm.error:
 
 if __name__ == '__main__':
     print "DB dirs:", db_dirs
-    print "DB file:", db_file
+    print "DB file:", xsetbg_db_path