Skip to content

Commit 0a9d8f2

Browse files
author
gau1991
committed
Merge branch 'python'
2 parents a871ece + 7e607db commit 0a9d8f2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

ee/core/aptget.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ def install(self, packages):
4747
global apt_get
4848
apt_get = apt_get.bake("-y")
4949
try:
50-
for line in apt_get.install(*packages, _iter=True):
50+
for line in apt_get.install("-o",
51+
"Dpkg::Options::=--force-confold",
52+
*packages, _iter=True):
5153
Log.info(self, Log.ENDC+line+Log.OKBLUE, end=' ')
5254
except ErrorReturnCode as e:
5355
Log.debug(self, "{0}".format(e))

ee/core/mysql.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ def backupAll(self):
9393
# Allow p1 to receive a SIGPIPE if p2 exits
9494
p1.stdout.close()
9595
output = p1.stderr.read()
96-
97-
if output == b'':
96+
p1.wait()
97+
if p1.returncode == 0:
9898
Log.debug(self, "done")
9999
else:
100-
Log.error(self, output)
100+
Log.error(self, output.decode("utf-8"))
101101
except Exception as e:
102102
Log.error(self, "Error: process exited with status %s"
103103
% e)

0 commit comments

Comments
 (0)