[Pkg-privacy-commits] [tails-installer] 03/07: Extra line for diskpart to be extra sure

Intrigeri intrigeri at moszumanska.debian.org
Wed May 24 15:27:45 UTC 2017


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

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

commit d1a5555ea7d3f33544950dc94aaf103352ebf984
Author: Martin Bříza <m at rtinbriza.cz>
Date:   Fri Apr 22 17:03:07 2016 +0200

    Extra line for diskpart to be extra sure
---
 liveusb/creator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 815fa98..82e34ff 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -626,7 +626,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
             mountvol.wait()
 
         diskpart = subprocess.Popen(['diskpart'], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        diskpart.communicate('select disk '+self.drive.device+'\r\nclean\r\nexit')
+        diskpart.communicate('select disk '+self.drive.device+'\r\nclean\r\nexit\r\n')
         diskpart.wait()
         if diskpart.returncode != 0:
             self.log('Diskpart exited with a nonzero status')
@@ -660,7 +660,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
         def restore_drive_work(callback, device):
             import threading
             diskpart = subprocess.Popen(['diskpart'], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            diskpart.communicate('select disk '+self.drive.device+'\r\nclean\r\ncreate part pri\r\nselect part 1\r\nformat fs=fat32 quick\r\nassign\r\nexit')
+            diskpart.communicate('select disk '+self.drive.device+'\r\nclean\r\ncreate part pri\r\nselect part 1\r\nformat fs=fat32 quick\r\nassign\r\nexit\r\n')
             diskpart.wait()
             callback(True)
 

-- 
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