? broken_delete.patch
? drupal-HEAD.maintenance_0.patch
? files
? install_edgecase.patch
? upload_exists.patch
? sites/default/settings.php
? sites/default/themes
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.199
diff -u -p -r1.199 system.install
--- modules/system/system.install	29 Nov 2007 12:02:06 -0000	1.199
+++ modules/system/system.install	30 Nov 2007 18:05:56 -0000
@@ -2724,7 +2724,9 @@ function system_update_6039() {
  */
 function system_update_6040() {
   $ret = array();
-  db_add_field($ret, 'upload', 'weight', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'));
+  if (db_table_exists('upload')) {
+    db_add_field($ret, 'upload', 'weight', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'));
+  }
   return $ret;
 }