remove shutter.xml if already exists

Fixes: LP:1691724 There was a case of shutter.xml being owned by root - possibly due to running the job as root. This patch is kind of work around. It removes the previously created shutter.xml if it exists, making shutil.copy() not throw an exception. In a situation where the parent dir is also root's xrandr_cycle will report a warning and use existing shutter.xml Signed-off-by: Maciej Kisielewski <maciej.kisielewski@canonical.com> 

1 files changed, 8 insertions, 1 deletions

diff --git a/bin/xrandr_cycle b/bin/xrandr_cycle
index f778562..2a5e915 100755
--- a/bin/xrandr_cycle
+++ b/bin/xrandr_cycle
@@ -100,7 +100,14 @@ except OSError as excp:
 "required directories: {}".format(excp))
 
 try:
- shutil.copy(shutter_xml_template, profile_path)
+ if os.path.exists(profile_path) and os.path.isfile(profile_path):
+ try:
+ os.remove(profile_path)
+ except PermissionError as exc:
+ print("Warning: could not remove {}. {}".format(
+ profile_path, exc))
+ else:
+ shutil.copy(shutter_xml_template, profile_path)
 except (IOError, OSError) as excp:
 print("ERROR: Unable to copy {} to {}: {}".format(shutter_xml_template,
 profile_path,