Skip to content

Commit 0f07e7a

Browse files
committed
Warn on missing dependencies
references Guake#1077
1 parent fd2a79b commit 0f07e7a

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ script:
3232
virtualenv test-rtd
3333
. ./test-rtd/bin/activate
3434
pip install -r requirements-dev.txt
35-
guake -h
3635
rm -rf test-rtd
3736
)
3837
# for dev
39-
- make dev
38+
- make dev-travis
4039
# check
4140
- make check
4241
- make build

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,14 @@ reset:
5151
all: clean dev style checks dists test docs
5252

5353
dev: clean-ln-venv ensure-pip pipenv-install-dev requirements ln-venv setup-githook prepare-install
54+
dev-travis: ensure-pip-system pipenv-install-dev requirements ln-venv setup-githook prepare-install
5455

5556
ensure-pip:
5657
./scripts/bootstrap-dev-pip.sh
5758

59+
ensure-pip-system:
60+
./scripts/bootstrap-dev-pip.sh system
61+
5862
dev-no-pipenv: clean
5963
virtualenv --python $(PYTHON_INTERPRETER) .venv
6064
. .venv/bin/activate && pip install -r requirements.txt -r requirements-dev.txt -e .

guake/main.py

+22
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,28 @@ def main():
244244
help=_('Do not execute the start up script')
245245
)
246246

247+
# checking mandatory dependencies
248+
import gi
249+
250+
try:
251+
gi.require_version('Gtk', '3.0')
252+
gi.require_version('Gdk', '3.0')
253+
except ValueError:
254+
print("[ERROR] Unable to start Guake, missing mandatory dependency: GtK 3.0")
255+
sys.exit(1)
256+
257+
try:
258+
gi.require_version('Vte', '2.91') # vte-0.42
259+
except ValueError:
260+
print("[ERROR] Unable to start Guake, missing mandatory dependency: Vte >= 0.42")
261+
sys.exit(1)
262+
263+
try:
264+
gi.require_version('Keybinder', '3.0')
265+
except ValueError:
266+
print("[ERROR] Unable to start Guake, missing mandatory dependency: Keybinder 3")
267+
sys.exit(1)
268+
247269
options = parser.parse_args()[0]
248270
if options.version:
249271
from guake import gtk_version

0 commit comments

Comments
 (0)