Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix install on xenial

Browse Source
This commit is contained in:
VirtuBox
2019-10-09 11:43:09 +02:00
parent fb20aa47b2
commit a9a8b3348c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
install
View File

@@ -118,10 +118,14 @@ _run() {
### ###
# 1- Update the apt sewers with fresh info # 1- Update the apt sewers with fresh info
### ###
if [ -z "$wo_travis" ]; then if [ -z "$wo_travis" ]; then
if command_exists curl; then if ! {
apt-get update -qq apt-get update --allow-releaseinfo-change -qq > /dev/null 2>&1
else }; then
apt-get update -qq > /dev/null 2>&1
fi
if ! command_exists curl; then
apt-get update -qq && apt-get -y install curl -qq > /dev/null 2>&1 apt-get update -qq && apt-get -y install curl -qq > /dev/null 2>&1
fi fi
fi fi

3
wo/core/aptget.py
View File

@@ -19,8 +19,7 @@ class WOAptGet():
try: try:
with open('/var/log/wo/wordops.log', 'a') as f: with open('/var/log/wo/wordops.log', 'a') as f:
proc = subprocess.Popen( proc = subprocess.Popen(
'DEBIAN_FRONTEND=noninteractive apt-get update ' 'DEBIAN_FRONTEND=noninteractive apt-get update -qq',
'--allow-releaseinfo-change',
shell=True, stdin=None, stdout=f, shell=True, stdin=None, stdout=f,
stderr=subprocess.PIPE, executable="/bin/bash") stderr=subprocess.PIPE, executable="/bin/bash")
proc.wait() proc.wait()