From bc7feda018dbfa12fcabcf3c19e36e478f319499 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 20 Jun 2019 18:42:18 +0000 Subject: reverted last commit, and fixed proper import of time() --- archinstall.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'archinstall.py') diff --git a/archinstall.py b/archinstall.py index 85423b04..0b5d3843 100644 --- a/archinstall.py +++ b/archinstall.py @@ -1,13 +1,13 @@ #!/usr/bin/python3 import traceback import os, re, struct, sys, json, pty, shlex -import urllib.request, urllib.parse, ssl, time +import urllib.request, urllib.parse, ssl from glob import glob from select import epoll, EPOLLIN, EPOLLHUP from socket import socket, inet_ntoa, AF_INET, AF_INET6, AF_PACKET from collections import OrderedDict as oDict from subprocess import Popen, STDOUT, PIPE -from time import sleep +from time import sleep, time ## == Profiles Path can be set via --profiles-path=/path ## This just sets the default path if the parameter is omitted. @@ -190,21 +190,21 @@ class sys_command(): yield output print('[N] Waiting for output to settle (5 sec)') - last = time.time() - while time.time()-last < 5: + last = time() + while time()-last < 5: for fileno, event in poller.poll(0.1): try: output = os.read(child_fd, 8192).strip() trace_log += output except OSError: - last = time.time() - 60 + last = time() - 60 break if 'debug' in self.opts and self.opts['debug']: if len(output): print(output) - last = time.time() + last = time() if 'debug' in self.opts and self.opts['debug']: print('[N] Exited subsystem, instructing it to shutdown.') -- cgit v1.2.3-70-g09d2