diff --git a/pym/install/install.py b/pym/install/install.py index 41054b2..d99efb3 100644 --- a/pym/install/install.py +++ b/pym/install/install.py @@ -185,20 +185,22 @@ class Install(MethodsInterface): pipe = Popen([fdisk_cmd, device_name], stdin=PIPE, stdout=PIPE, stderr=PIPE) for part_num in change_active: - pipe.stdin.write("a\n%s\n" % part_num) - pipe.stdin.write("w\n") + write_str = "a\n%s\n" % part_num + pipe.stdin.write(write_str.encode("UTF-8")) + pipe.stdin.write(b"w\n") pipe.stdin.close() pipe.wait() elif partition_table == "gpt": pipe = Popen([gdisk_cmd, device_name], stdin=PIPE, stdout=PIPE, stderr=PIPE) if device_partition_count > 1: - pipe.stdin.write("x\n") + pipe.stdin.write(b"x\n") for part_num in change_active: - pipe.stdin.write("a\n%s\n2\n\n" % part_num) - pipe.stdin.write("w\nY\n") + write_str = "a\n%s\n2\n\n" % part_num + pipe.stdin.write(write_str.encode("UTF-8")) + pipe.stdin.write(b"w\nY\n") else: - pipe.stdin.write("x\na\n2\n\nw\nY\n") + pipe.stdin.write(b"x\na\n2\n\nw\nY\n") pipe.stdin.close() pipe.wait() for wait_time in (0.1, 0.2, 0.5, 1, 2, 4): diff --git a/pym/install/migrate_users.py b/pym/install/migrate_users.py index 6dbddf4..126e2bd 100644 --- a/pym/install/migrate_users.py +++ b/pym/install/migrate_users.py @@ -126,13 +126,13 @@ class migrateUsers(_shareData): """Get data system users in new system""" fileName = pathJoin(self.prefixNewSystem, self.filePasswd) return [x for x in self.getData(fileName=fileName) - if self._reNumb.match(x[2]) and (int(x[2] > self.maxId) or int(x[2]) < self.minId)] + if self._reNumb.match(x[2]) and (int(x[2]) > self.maxId or int(x[2]) < self.minId)] def getThisDataSystemUsers(self): """Get data system users in this system""" fileName = self.filePasswd return [x for x in self.getData(fileName=fileName) - if self._reNumb.match(x[2]) and (int(x[2] > self.maxId) or int(x[2]) < self.minId)] + if self._reNumb.match(x[2]) and (int(x[2]) > self.maxId or int(x[2]) < self.minId)] def getNewProcessedData(self, migrateUsers=()): """Get processed data migrate users in new system"""