Index: modules/system/system.install
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/system/system.install,v
retrieving revision 1.513
diff -u -p -r1.513 system.install
--- modules/system/system.install	5 Oct 2010 00:31:19 -0000	1.513
+++ modules/system/system.install	5 Oct 2010 05:03:12 -0000
@@ -2130,7 +2130,7 @@ function system_update_7033() {
 }
 
 /**
- * Migrate the file_downloads setting and create the new {file_managed} table.
+ * Migrate the file path settings and create the new {file_managed} table.
  */
 function system_update_7034() {
   $files_directory = variable_get('file_directory_path', NULL);
@@ -2148,6 +2148,10 @@ function system_update_7034() {
   }
   variable_del('file_downloads');
 
+  $d6_file_directory_temp = variable_get('file_directory_temp', file_directory_temp());
+  variable_set('file_temporary_path', $d6_file_directory_temp);
+  variable_del('file_directory_temp');
+
   $schema['file_managed'] = array(
     'description' => 'Stores information for uploaded files.',
     'fields' => array(
Index: modules/simpletest/tests/upgrade/drupal-6.filled.database.php
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/simpletest/tests/upgrade/drupal-6.filled.database.php,v
retrieving revision 1.4
diff -u -p -r1.4 drupal-6.filled.database.php
--- modules/simpletest/tests/upgrade/drupal-6.filled.database.php	4 Oct 2010 14:51:16 -0000	1.4
+++ modules/simpletest/tests/upgrade/drupal-6.filled.database.php	5 Oct 2010 05:02:02 -0000
@@ -19735,7 +19735,15 @@ db_insert('variable')->fields(array(
 ))
 ->values(array(
   'name' => 'file_directory_temp',
-  'value' => 's:26:"/Applications/MAMP/tmp/php";',
+  'value' => 's:29:"/drupal-6/file/directory/temp";',
+))
+->values(array(
+  'name' => 'file_directory_path',
+  'value' => 's:29:"/drupal-6/file/directory/path";',
+))
+->values(array(
+  'name' => 'file_downloads',
+  'value' => 'i:2;',
 ))
 ->values(array(
   'name' => 'filter_html_1',
Index: modules/simpletest/tests/upgrade/upgrade.upload.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/simpletest/tests/upgrade/upgrade.upload.test,v
retrieving revision 1.1
diff -u -p -r1.1 upgrade.upload.test
--- modules/simpletest/tests/upgrade/upgrade.upload.test	3 Oct 2010 23:19:52 -0000	1.1
+++ modules/simpletest/tests/upgrade/upgrade.upload.test	5 Oct 2010 05:07:46 -0000
@@ -62,5 +62,15 @@ class UploadUpgradePathTestCase extends 
       $diff = array_diff($filenames, $recorded_filenames);
       $this->assertTrue(empty($diff), 'The uploaded files are present in the same order after the upgrade.');
     }
+    // Make sure the file settings were properly migrated.
+    $d6_file_directory_temp = '/drupal-6/file/directory/temp';
+    $d6_file_directory_path = '/drupal-6/file/directory/path';
+    $d6_file_downloads = 2; // FILE_DOWNLOADS_PRIVATE
+
+    debug(variable_get('file_directory_temp', NULL));
+    $this->assertNull(variable_get('file_directory_temp', NULL), "The 'file_directory_temp' variable was properly removed.");
+    $this->assertEqual(variable_get('file_temporary_path', 'drupal-7-bogus'), $d6_file_directory_temp, "The 'file_temporary_path' setting was properly migrated.");
+    $this->assertEqual(variable_get('file_default_scheme', 'drupal-7-bogus'), 'private', "The 'file_default_scheme' setting was properly migrated.");
+    $this->assertEqual(variable_get('file_private_path', 'drupal-7-bogus'), $d6_file_directory_path, "The 'file_private_path' setting was properly migrated.");
   }
 }