[vidalia-svn] r3359: Tell the auto-updater to leave its droppings under Vidalia's (vidalia/branches/auto-updates/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-12-01 22:17:38 -0500 (Mon, 01 Dec 2008)
New Revision: 3359

Modified:
   vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp
   vidalia/branches/auto-updates/src/vidalia/updateprocess.h
Log:
Tell the auto-updater to leave its droppings under Vidalia's data directory.


Modified: vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp	2008-12-01 01:09:37 UTC (rev 3358)
+++ vidalia/branches/auto-updates/src/vidalia/updateprocess.cpp	2008-12-02 03:17:38 UTC (rev 3359)
@@ -31,6 +31,7 @@
 
   args << "E:\\thandy\\lib\\thandy\\ClientCLI.py"
        << "update"  << "--controller-log-format" 
+       << "--repo=" + updateRepositoryDir()
        << "--debug" << bundleInfoToString(bi);
 
   vNotice("updater: launching auto-update executable: %1 %2")
@@ -47,6 +48,7 @@
 
   args << "E:\\thandy\\lib\\thandy\\ClientCLI.py"
        << "update" << "--controller-log-format"
+       << "--repo=" + updateRepositoryDir()
        << "--install" << bundleInfoToString(bi);
   
   vNotice("updater: launching auto-update executable: %1 %2")
@@ -141,6 +143,12 @@
 }
 
 QString
+UpdateProcess::updateRepositoryDir()
+{
+  return Vidalia::dataDirectory() + "/updates";
+}
+
+QString
 UpdateProcess::bundleInfoToString(BundleInfo bi)
 {
   switch (bi) {

Modified: vidalia/branches/auto-updates/src/vidalia/updateprocess.h
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/updateprocess.h	2008-12-01 01:09:37 UTC (rev 3358)
+++ vidalia/branches/auto-updates/src/vidalia/updateprocess.h	2008-12-02 03:17:38 UTC (rev 3359)
@@ -51,12 +51,19 @@
   static bool shouldCheckForUpdates(const QDateTime &lastCheckedAt);
 
   /** Returns the preferred interval (in seconds) between executions of the
-   * Glider process to check for available software updates. */
+   * Glider process to check for available software updates.
+   */
   static int checkForUpdatesInterval();
 
-  /** Returns the path and filename of the software update executable. */
+  /** Returns the path and filename of the software update executable.
+   */
   static QString updateExecutable();
 
+  /** Returns the path in which the software update executable should write
+   * all of its state information.
+   */
+  static QString updateRepositoryDir();
+
 signals:
   void checkForUpdatesFailed(QString errmsg);