Skip to content
Snippets Groups Projects
Unverified Commit e98a5a26 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

packaging: fix opensuse-leap:15.1 build

Also remove some warnings in make-ring.py

Change-Id: I8fabab27a33e94a9a0eabcce4e22cdf760bc8e05
parent d69c0a6b
No related branches found
No related tags found
No related merge requests found
FROM opensuse/leap:15.2 FROM opensuse/leap:15.1
RUN zypper --non-interactive install dnf RUN zypper --non-interactive install dnf
RUN dnf clean all RUN dnf clean all
RUN zypper --non-interactive lr RUN zypper --non-interactive lr
......
...@@ -192,7 +192,7 @@ def run_powersell_cmd(cmd): ...@@ -192,7 +192,7 @@ def run_powersell_cmd(cmd):
def write_qt_conf(path): def write_qt_conf(path):
# Add a configuration that can be supplied to qmake # Add a configuration that can be supplied to qmake
# e.g. `qmake -qt=5.15 [mode] [options] [files]` # e.g. `qmake -qt=5.15 [mode] [options] [files]`
if path is '': if path == '':
return return
with open('/usr/share/qtchooser/' + QT5_VERSION + '.conf', 'w+') as fd: with open('/usr/share/qtchooser/' + QT5_VERSION + '.conf', 'w+') as fd:
fd.write(path.rstrip('/') + '/bin\n') fd.write(path.rstrip('/') + '/bin\n')
...@@ -352,7 +352,7 @@ def run_install(args): ...@@ -352,7 +352,7 @@ def run_install(args):
else: else:
install_args += ("-c", "client-qt") install_args += ("-c", "client-qt")
install_args += ("-q", QT5_VERSION) install_args += ("-q", QT5_VERSION)
if args.qt is '': if args.qt == '':
install_args += ("-Q", DEFAULT_QT_PATH) install_args += ("-Q", DEFAULT_QT_PATH)
else: else:
install_args += ("-Q", args.qt) install_args += ("-Q", args.qt)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment