[vidalia-svn] r3368: Ignore CAN_INSTALL messages if we're installing updates. We (vidalia/branches/auto-updates/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-12-06 19:41:37 -0500 (Sat, 06 Dec 2008)
New Revision: 3368

Modified:
   vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp
Log:
Ignore CAN_INSTALL messages if we're installing updates. We already know
those packages are available, so no need to go json2xml'ing again.


Modified: vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp	2008-12-07 00:29:13 UTC (rev 3367)
+++ vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp	2008-12-07 00:41:37 UTC (rev 3368)
@@ -89,7 +89,8 @@
     if (! ok)
       continue;
 
-    if (! type.compare("CAN_INSTALL", Qt::CaseInsensitive)) {
+    if (_currentCommand == CheckForUpdates
+          && ! type.compare("CAN_INSTALL", Qt::CaseInsensitive)) {
       QString package = args.value("PKG");
       if (! package.isEmpty()) {
         PackageInfo pkgInfo = packageInfo(package);