sysinfo: Lower priority of make.conf for distro name

This is used elsewhere other than Gentoo so it is a rather
unreliable check compared to lsb-release.

diff --git a/plugins/sysinfo/unix/parse.c b/plugins/sysinfo/unix/parse.c
index f7419e24dec0a5219baa7c32a6d4f33a1c3ded12..0e4e88771cf60364cccd69a47abb3eb787730bc9 100644 (file)
--- a/plugins/sysinfo/unix/parse.c
+++ b/plugins/sysinfo/unix/parse.c
@@ -256,19 +256,7 @@ int xs_parse_distro(char *name)
        FILE *fp = NULL;
        char buffer[bsize], *pos = NULL;
 
-       if((fp = fopen("/etc/portage/make.conf", "r")) != NULL ||
-                       (fp = fopen("/etc/make.conf", "r")) != NULL)
-       {
-               char keywords[bsize];
-               while(fgets(buffer, bsize, fp) != NULL)
-                       find_match_char(buffer, "ACCEPT_KEYWORDS", keywords);
-               /* cppcheck-suppress uninitvar */
-               if (strstr(keywords, "\"") == NULL)
-                       g_snprintf(buffer, bsize, "Gentoo Linux (stable)");
-               else
-                       g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
-       }
-       else if((fp = fopen("/etc/redhat-release", "r")) != NULL)
+       if((fp = fopen("/etc/redhat-release", "r")) != NULL)
                fgets(buffer, bsize, fp);
        else if((fp = fopen("/etc/mageia-release", "r")) != NULL)
                fgets(buffer, bsize, fp);
@@ -302,6 +290,18 @@ int xs_parse_distro(char *name)
                fgets(release, bsize, fp);
                g_snprintf(buffer, bsize, "Debian %s", release);
        }
+       else if((fp = fopen("/etc/portage/make.conf", "r")) != NULL ||
+                       (fp = fopen("/etc/make.conf", "r")) != NULL)
+       {
+               char keywords[bsize];
+               while(fgets(buffer, bsize, fp) != NULL)
+                       find_match_char(buffer, "ACCEPT_KEYWORDS", keywords);
+               /* cppcheck-suppress uninitvar */
+               if (strstr(keywords, "\"") == NULL)
+                       g_snprintf(buffer, bsize, "Gentoo Linux (stable)");
+               else
+                       g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
+       }
        else
                g_snprintf(buffer, bsize, "Unknown Distro");
        if(fp != NULL)