[Pkg-privacy-commits] [tails-installer] 44/210: REVIEW: Fix errors on overwriting an existing image

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit 3884a40b9893b1063418868cc3ad1be2ea274bef
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Mar 19 15:15:56 2015 +0100

    REVIEW: Fix errors on overwriting an existing image
---
 liveusb/creator.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index b1f5347..dbffdab 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -761,8 +761,15 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
         LiveUSBCreator.install_bootloader(self)
         self.log.info(_("Installing bootloader..."))
         syslinux_path = os.path.join(self.dest, "syslinux")
+        try:
+            shutil.rmtree(syslinux_path)
+        except OSError, e:
+            pass
         shutil.move(os.path.join(self.dest, "isolinux"), syslinux_path)
-        os.unlink(os.path.join(syslinux_path, "isolinux.cfg"))
+        try:
+            os.unlink(os.path.join(syslinux_path, "isolinux.cfg"))
+        except OSError, e:
+            pass
 
         # Syslinux doesn't guarantee the API for its com32 modules (#492370)
         for com32mod in ('vesamenu.c32', 'menu.c32'):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git