From e98a5a26e9ef133bd90449e3128ca6352b122ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 10 Nov 2020 11:19:41 -0500
Subject: [PATCH] packaging: fix opensuse-leap:15.1 build
Also remove some warnings in make-ring.py
Change-Id: I8fabab27a33e94a9a0eabcce4e22cdf760bc8e05
---
docker/Dockerfile_opensuse-leap_15.1 | 2 +-
make-ring.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker/Dockerfile_opensuse-leap_15.1 b/docker/Dockerfile_opensuse-leap_15.1
index 54f7bc76..0bb7a964 100644
--- a/docker/Dockerfile_opensuse-leap_15.1
+++ b/docker/Dockerfile_opensuse-leap_15.1
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.2
+FROM opensuse/leap:15.1
RUN zypper --non-interactive install dnf
RUN dnf clean all
RUN zypper --non-interactive lr
diff --git a/make-ring.py b/make-ring.py
index f68fbe23..344f5b5c 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -192,7 +192,7 @@ def run_powersell_cmd(cmd):
def write_qt_conf(path):
# Add a configuration that can be supplied to qmake
# e.g. `qmake -qt=5.15 [mode] [options] [files]`
- if path is '':
+ if path == '':
return
with open('/usr/share/qtchooser/' + QT5_VERSION + '.conf', 'w+') as fd:
fd.write(path.rstrip('/') + '/bin\n')
@@ -352,7 +352,7 @@ def run_install(args):
else:
install_args += ("-c", "client-qt")
install_args += ("-q", QT5_VERSION)
- if args.qt is '':
+ if args.qt == '':
install_args += ("-Q", DEFAULT_QT_PATH)
else:
install_args += ("-Q", args.qt)
--
GitLab