summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-11 15:26:18 +0000
committerintrigeri <intrigeri@boum.org>2015-07-11 15:26:18 +0000
commit3b1ddfad631b874f98d7c14a098a7123c61927a0 (patch)
tree773f6e44392434843b3866b2515194850fc2fbf6
parent5d53247133c6e73f0a0d3668464ccd568e63193f (diff)
parentaeb18a4feba18ae7e2a13736104300dd2fdd6940 (diff)
Merge branch 'feature/jessie' into debian_feature-jessie
-rw-r--r--ChangeLog4
-rwxr-xr-xdata/liveusb-creator.ui1
-rwxr-xr-xliveusb/creator.py2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae0ef0d..d20d766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Date: Mon Apr 6 11:23:14 2015 +0100
+History is versioned in this Git repository:
+https://git-tails.immerda.ch/liveusb-creator
+
commit 0225dc48eb0e8f462b3082cd2aecb271decf7988
Author: Luke Macken <lmacken@redhat.com>
Date: Wed Jun 24 14:09:58 2009 -0400
diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui
index c6df194..eceaa83 100755
--- a/data/liveusb-creator.ui
+++ b/data/liveusb-creator.ui
@@ -284,6 +284,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
+ <property name="wrap_mode">word</property>
<property name="left_margin">6</property>
<property name="right_margin">6</property>
<property name="cursor_visible">False</property>
diff --git a/liveusb/creator.py b/liveusb/creator.py
index b8fe44f..6a3e071 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1043,8 +1043,6 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
os.stat(tmp_syslinux).st_mode | stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH)
self.flush_buffers()
self.unmount_device()
- # XXX: use call_open_for_restore_sync to avoid needing write
- # access to the raw block device
self.popen('%s %s -d %s %s' % (
tmp_syslinux,
' '.join(self.syslinux_options()),