Add more debug info around Nvidia checks

Issue: #380 Signed-off-by: Jiří Janoušek <janousek.jiri@gmail.com>
tiliado · Oct 11, 2017 · 3a70eb5 · 3a70eb5
1 parent 79f5b66
commit 3a70eb5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/nuvolakit-runner/system/Graphics.vala b/src/nuvolakit-runner/system/Graphics.vala
@@ -30,12 +30,12 @@ public string? get_required_gl_extension() {
 	try {
 		var nvidia_version = Drt.System.read_file(File.new_for_path("/sys/module/nvidia/version")).strip();
 		if (nvidia_version != "") {
-			if (FileUtils.test("/sys/module/i915", FileTest.EXISTS)
-			&& FileUtils.test("/sys/fs/cgroup/pids/system.slice/bumblebeed.service", FileTest.EXISTS)) {
-				return null;  // tiliado/nuvolaruntime#380
-			} else {
-				return "nvidia-" + nvidia_version.replace(".", "-");
-			}
+			var i915 = FileUtils.test("/sys/module/i915", FileTest.EXISTS);
+			var bumblebeed = FileUtils.test("/sys/fs/cgroup/pids/system.slice/bumblebeed.service", FileTest.EXISTS);
+			var ignored = i915 && bumblebeed;  // tiliado/nuvolaruntime#380
+			debug("Nvidia %s, i915 %d, bumblebeed %d => ignored %d",
+				nvidia_version, (int) i915, (int) bumblebeed, (int) ignored);
+			return ignored ? null : "nvidia-" + nvidia_version.replace(".", "-");
 		}	
 	}
 	catch (GLib.Error e) {