[PlaneShift-svn] SF.net SVN: planeshift: [1679] trunk/src/pslaunch

[<mg...@us...>]

Revision: 1679
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1679&view=rev
Author:   mgist
Date:     2008-06-02 17:42:04 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
- More updater fixes.

Modified Paths:
--------------
    trunk/src/pslaunch/download.cpp
    trunk/src/pslaunch/updaterengine.cpp

Modified: trunk/src/pslaunch/download.cpp
===================================================================
--- trunk/src/pslaunch/download.cpp	2008-06-03 00:27:01 UTC (rev 1678)
+++ trunk/src/pslaunch/download.cpp	2008-06-03 00:42:04 UTC (rev 1679)
@@ -141,9 +141,9 @@
         if (result != nsSocket::OK && !silent)
         {
             if (result == nsSocket::E_INVALID_HOST)
-                error.Format("Couldn't connect to mirror %s. \n", url.GetData());
+                error.Format("Couldn't connect to mirror %s\n", url.GetData());
             else
-                error.Format("Error while downloading file: %s.\n", url.GetData());
+                error.Format("Error while downloading file: %s\n", url.GetData());
         }
 
         // Tell the user that we failed
@@ -152,9 +152,9 @@
             if(!silent)
             {
                 if(error.IsEmpty())
-                    printf ("Server error %i (%s).\n", httpCode, url.GetData());
+                    printf ("Server error %i (%s)\n", httpCode, url.GetData());
                 else
-                    printf ("Server error: %s (%i).\n", error.GetData(), httpCode);
+                    printf ("Server error: %s (%i)\n", error.GetData(), httpCode);
             }
 
             if(!URL)

Modified: trunk/src/pslaunch/updaterengine.cpp
===================================================================
--- trunk/src/pslaunch/updaterengine.cpp	2008-06-03 00:27:01 UTC (rev 1678)
+++ trunk/src/pslaunch/updaterengine.cpp	2008-06-03 00:42:04 UTC (rev 1679)
@@ -898,6 +898,7 @@
         GetConfig()->GetProxy().port);
 
     // Get the zip with md5sums.
+    fileUtil->RemoveFile("integrity.zip", true);
     csString baseurl = config->GetCurrentConfig()->GetMirror(0)->GetBaseURL();
     baseurl.Append("backup/");
     if(!downloader->DownloadFile(baseurl + "integrity.zip", "integrity.zip", true, true))
@@ -988,13 +989,13 @@
                     for(size_t i=0; i<failedSize; i++)
                     {
                         csString downloadpath("/this/");
-                        if(!downloader->DownloadFile(baseurl + failed.Get(i)->GetAttributeValue("path"),
-                                                     downloadpath + failed.Get(i)->GetAttributeValue("path"), true, true))
+                        downloadpath.Append(failed.Get(i)->GetAttributeValue("path"));
+                        fileUtil->RemoveFile(downloadpath, true);
+                        if(!downloader->DownloadFile(baseurl + failed.Get(i)->GetAttributeValue("path"), downloadpath, true, true))
                         {
                             // Maybe it's in a platform specific subdirectory. Try that next.
                            csString url = baseurl + config->GetNewConfig()->GetPlatform() + "/";
-                           downloader->DownloadFile(url + failed.Get(i)->GetAttributeValue("path"),
-                                                    downloadpath + failed.Get(i)->GetAttributeValue("path"), true, true);
+                           downloader->DownloadFile(url + failed.Get(i)->GetAttributeValue("path"), downloadpath, true, true);
                         }
                     }
                     PrintOutput("Done!\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.