[Pkg-privacy-commits] [tails-installer] 29/30: Drop 10731.patch which was applied upstream.
anonym
anonym-tails-guest at moszumanska.debian.org
Fri Jun 9 16:23:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
anonym-tails-guest pushed a commit to branch tails/jessie
in repository tails-installer.
commit b2591eb205fd93d3834abbd2cd1527a677f131c1
Author: anonym <anonym at riseup.net>
Date: Fri Jun 9 18:15:29 2017 +0200
Drop 10731.patch which was applied upstream.
---
debian/patches/10731.patch | 47 ---------------------------------------------
debian/patches/series | 1 -
tails_installer/launcher.py | 2 +-
3 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/debian/patches/10731.patch b/debian/patches/10731.patch
deleted file mode 100644
index f97047e..0000000
--- a/debian/patches/10731.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/tails_installer/creator.py b/tails_installer/creator.py
-index 71bbea4..95a4102 100755
---- a/tails_installer/creator.py
-+++ b/tails_installer/creator.py
-@@ -575,7 +575,6 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
-
- def detect_supported_drives(self, callback=None, force_partitions=False):
- """ Detect all supported (USB and SDIO) storage devices using UDisks.
-- Note that the removable bit is not checked.
- """
- mounted_parts = {}
- self.drives = {}
-@@ -609,7 +608,13 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
- 'size': drive.props.size,
- 'mounted_partitions': set(),
- 'is_device_big_enough': True,
-+ 'removable': drive.props.media_removable,
- }
-+
-+ # Check non-removable drives
-+ if not data['removable']:
-+ self.log.debug('Skipping non-removable device: %s' % data['device'])
-+
- # Only pay attention to USB and SDIO devices, unless --force'd
- iface = drive.props.connection_bus
- if iface != 'usb' and iface != 'sdio' and self.opts.force != data['device']:
-diff --git a/tails_installer/gui.py b/tails_installer/gui.py
-index 5018bc7..10b75b3 100755
---- a/tails_installer/gui.py
-+++ b/tails_installer/gui.py
-@@ -483,6 +483,16 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
- 'model': info['model'],
- 'details': details
- }
-+ # Skip devices with non-removable bit enabled
-+ if not info['removable']:
-+ message =_('The USB stick "%(pretty_name)s"'
-+ ' is configured as non-removable by its'
-+ ' manufacturer and Tails will fail to start on it.'
-+ ' Please try installing on a different model.') % {
-+ 'pretty_name': pretty_name
-+ }
-+ self.status(message)
-+ continue
- # Skip too small devices, but inform the user
- if not info['is_device_big_enough']:
- message =_('The device "%(pretty_name)s"'
diff --git a/debian/patches/series b/debian/patches/series
index 0c77508..10d87a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
tails-installer-as-helper
-10731.patch
diff --git a/tails_installer/launcher.py b/tails_installer/launcher.py
index e56525f..60faab9 100644
--- a/tails_installer/launcher.py
+++ b/tails_installer/launcher.py
@@ -38,7 +38,7 @@ class TailsInstallerLauncherWindow(Gtk.ApplicationWindow):
def run_tails_installer(self, args):
args = ['tails-installer'] + args + self.args
- os.execvp('tails-installer', args)
+ os.execvp('/usr/lib/tails_installer/tails-installer', args)
def on_clone_install(self, widget, data=None):
self.run_tails_installer([ '-u', '-n', '--clone', '-P', '-m', '-x' ])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list