[Goodies-commits] r3286 - xfce4-smartpm-plugin/trunk/src

[Anders F Bjorklund]

Author: afb
Date: 2007-10-04 12:01:30 +0000 (Thu, 04 Oct 2007)
New Revision: 3286

Modified:
   xfce4-smartpm-plugin/trunk/src/xfcesmart.c
Log:
do string checks second

Modified: xfce4-smartpm-plugin/trunk/src/xfcesmart.c
===================================================================
--- xfce4-smartpm-plugin/trunk/src/xfcesmart.c	2007-10-02 21:03:30 UTC (rev 3285)
+++ xfce4-smartpm-plugin/trunk/src/xfcesmart.c	2007-10-04 12:01:30 UTC (rev 3286)
@@ -481,15 +481,15 @@
   {
     while ( (p = fgets(buf, sizeof(buf), file)) != NULL )
     {
-      if (strstr(p, "Failed to write temporary StateFile") != NULL &&
-          smart->package_manager == PACKAGE_MANAGER_APT)
+      if (smart->package_manager == PACKAGE_MANAGER_APT &&
+          strstr(p, "Failed to write temporary StateFile") != NULL)
       {
         /* skip this error, we don't want to write anything anyway */
         status = 0;
         continue;
       }
-      if (strstr(p, "error: ") != NULL ||
-          smart->package_manager != PACKAGE_MANAGER_SMART)
+      if (smart->package_manager != PACKAGE_MANAGER_SMART ||
+          strstr(p, "error: ") != NULL)
       {
         if (strstr(p, "error: ") == 0)
           p += strlen("error: ");