From b75903c8f8c182553873448a785c00439155999a Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 3 Jan 2017 22:53:18 +0530
Subject: [PATCH] Revert "setup.py: Use the detected Ninja and quote build_dir"

This reverts commit 9a64b727bf6ad42d66f1e5f0404baca46f57167c.

Closes https://bugzilla.gnome.org/show_bug.cgi?id=776801

The actual fix is in the next commit.
---
 common.py | 5 +++--
 setup.py  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common.py b/common.py
index 67d02d5..8c8b55d 100644
--- a/common.py
+++ b/common.py
@@ -45,9 +45,10 @@ def git(*args, repository_path='.'):
                                    stderr=subprocess.STDOUT).decode()
 
 def accept_command(commands):
-    """Search @commands and returns the first found command"""
+    """Search @commands and returns the first found absolute path."""
     for command in commands:
-        if shutil.which(command):
+        command = shutil.which(command)
+        if command:
             return command
 
     return None
diff --git a/setup.py b/setup.py
index 1f9d1a1..38d4f72 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ class GstBuildConfigurer:
             subprocess.check_call(
                 [sys.executable, meson, "../"] + self.args + self.get_configs(), cwd=build_dir)
             print("\nYou can now build GStreamer and its various subprojects running:\n"
-                  " $ {} -C {!r}".format(ninja, build_dir))
+                  " $ ninja -C %s" % build_dir)
         except subprocess.CalledProcessError:
             return False
 
-- 
2.7.4