RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

install: fix up errors when required packages not installed

This commit is contained in:
Peter F. Patel-Schneider 2020-04-05 12:18:30 -04:00 committed by Filipe Laíns
parent 5f8dbdeb6d
commit 624247d378
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/installation.md
View File

@ -17,7 +17,7 @@ and the `python3-pyudev` package.
To run the GUI, solaar also requires Gtk3, and its GObject To run the GUI, solaar also requires Gtk3, and its GObject
Introspection bindings. The Debian/Ubuntu package names are Introspection bindings. The Debian/Ubuntu package names are
`python3-gi` and `gir1.2-gtk-3.0`; `python3-gi` and `gir1.2-gtk-3.0`;
in Fedora you only need `python3-gobject`; in Fedora you need `gtk3` and `python3-gobject`;
if you're using another if you're using another
distribution the required packages are most likely named something similar. distribution the required packages are most likely named something similar.

9
lib/solaar/gtk.py
View File

@ -31,10 +31,12 @@ import solaar.cli as _cli
# #
# #
def _require(module, os_package): def _require(module, os_package, gi=None, gi_package=None, gi_version=None):
try: try:
if gi is not None:
gi.require_version(gi_package,gi_version)
return importlib.import_module(module) return importlib.import_module(module)
except ImportError: except (ImportError, ValueError):
import sys import sys
sys.exit("%s: missing required system package %s" % (NAME, os_package)) sys.exit("%s: missing required system package %s" % (NAME, os_package))
@ -94,8 +96,7 @@ def main():
return _cli.run(args.action, args.hidraw_path) return _cli.run(args.action, args.hidraw_path)
gi = _require('gi', 'python3-gi or python3-gobject') gi = _require('gi', 'python3-gi or python3-gobject')
gi.require_version('Gtk', '3.0') _require('gi.repository.Gtk', 'gir1.2-gtk-3.0', gi, 'Gtk', '3.0')
_require('gi.repository.Gtk', 'gir1.2-gtk-3.0')
try: try:
import solaar.ui as ui import solaar.ui as ui