Re: Patch: Debian binary detection fix

[Richard Hughes <hughsient gmail com>]

2009/11/26 Pascal de Bruijn <pmjdebruijn pcode nl>:
> Therefore the detect should _first_ detect if the Debian renamed
> binaries exist, and if not, fallback to the original binary names.

Agreed. I've attached the patch I've committed. Thanks.

Richard.

commit b577db42088a609326658acde4afb65a85c138ec
Author: Richard Hughes <richard hughsie com>
Date:   Thu Nov 26 21:04:56 2009 +0000

    Look for the debian binary first. Based on a patch from Pascal de Bruijn <pmjdebruijn pcode nl>, many thanks.

diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 434aa28..c06e2b9 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -323,15 +323,15 @@ gcm_calibrate_get_tool_filename (const gchar *command, GError **error)
 	gboolean ret;
 	gchar *filename;
 
-	/* test original argyllcms name */
-	filename = g_strdup_printf ("/usr/bin/%s", command);
+	/* try the debian filename */
+	filename = g_strdup_printf ("/usr/bin/argyll-%s", command);
 	ret = g_file_test (filename, G_FILE_TEST_EXISTS);
 	if (ret)
 		goto out;
 
-	/* try the debian one */
+	/* try the original argyllcms filename */
 	g_free (filename);
-	filename = g_strdup_printf ("/usr/bin/argyll-%s", command);
+	filename = g_strdup_printf ("/usr/bin/%s", command);
 	ret = g_file_test (filename, G_FILE_TEST_EXISTS);
 	if (ret)
 		goto out;