summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2014-06-15 17:45:08 +0000
committerTails developers <tails@boum.org>2014-06-15 17:45:08 +0000
commitf378c8aa79b5678f6882ab4169923aa2dbb5dd8d (patch)
treea3d6ef95444e760be2e28be54a5d903d2d6be5d3
parentac299ea4bc11ead4d8861ffb70666ca168eddc03 (diff)
Actually rename isolinux->syslinux *after* operations that rely on the old name have completed.bugfix/7345-upgrade-from-iso-from-1.0-to-1.1
-rwxr-xr-xliveusb/creator.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/liveusb/creator.py b/liveusb/creator.py
index fb5b096..ad9a0ab 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -457,10 +457,6 @@ class LiveUSBCreator(object):
(bootconf, bootx64conf),
(bootconf, bootia32conf)]
- syslinux_path = self.get_liveos_file_path("syslinux")
- _move_if_exists(self.get_liveos_file_path("isolinux"), syslinux_path)
- _unlink_if_exists(os.path.join(syslinux_path, "isolinux.cfg"))
-
for (infile, outfile) in updates:
if os.path.exists(infile):
self._update_configs(infile, outfile)
@@ -475,6 +471,10 @@ class LiveUSBCreator(object):
'outfile': outfile,
'message': str(e)})
+ syslinux_path = self.get_liveos_file_path("syslinux")
+ _move_if_exists(self.get_liveos_file_path("isolinux"), syslinux_path)
+ _unlink_if_exists(os.path.join(syslinux_path, "isolinux.cfg"))
+
def delete_liveos(self):
""" Delete the files installed by the existing Live OS, after
chmod'ing them since Python for Windows is unable to delete