diff --git a/docker/Dockerfile_opensuse-leap_15.1 b/docker/Dockerfile_opensuse-leap_15.1 index 54f7bc76e0c826fa65a2d7fc230f37df49e7b2f9..0bb7a9641203de888a3bb025a152cf5a6f209ccd 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 f68fbe2322bf8ba58a5ee0a41b2df95f668086f2..344f5b5c3bf46da04ca05f594b6e101ce340b5b0 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)