From: Oleg Broytman Date: Tue, 9 Feb 2010 16:06:12 +0000 (+0000) Subject: Unlock the lock file after executing xli/xsetbg X-Git-Tag: v4.0.0~29 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=8cc3d8fdd0f96d52350e228de472e849ba62ce6a;p=xsetbg.git Unlock the lock file after executing xli/xsetbg (they are executed now in a subprocess). git-svn-id: file:///home/phd/archive/SVN/xsetbg/trunk@39 143022c7-580b-0410-bae3-87f2bf5d3141 --- diff --git a/xsetbg.py b/xsetbg.py index c57e56a..ce3ffad 100755 --- a/xsetbg.py +++ b/xsetbg.py @@ -194,6 +194,14 @@ def ping(force=False): global_db[old_filename_key] = global_db[filename_key] global_db[filename_key] = image_name + program_options = ["xli", "-onroot", "-quiet"] + \ + ["-center", "-border", random.choice(borders), "-zoom", "auto", + image_name] + + rc = subprocess.call(program_options) + if rc: + error("cannot execute xli!") + finally: # Unlock and close the lock file flock(lock_file, LOCK_UN) @@ -201,14 +209,6 @@ def ping(force=False): # Flush and close the global persistent dictionary if global_db: global_db.close() - program_options = ["xli", "-onroot", "-quiet"] + \ - ["-center", "-border", random.choice(borders), "-zoom", "auto", - image_name] - - rc = subprocess.call(program_options) - if rc: - error("cannot execute xli!") - @published def force(): ping(force=True)