Index: includes/update.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/update.inc,v
retrieving revision 1.14
diff -u -p -r1.14 update.inc
--- includes/update.inc	24 Oct 2009 01:22:28 -0000	1.14
+++ includes/update.inc	24 Oct 2009 01:31:35 -0000
@@ -128,10 +128,15 @@ function update_fix_d7_requirements() {
     $schema['cache_path']['description'] = 'Cache table used for path alias lookups.';
 
     // system_update_7042() renames columns, but these are needed to bootstrap.
-    // add empty columns for now.
+    // Add empty columns for now.
     db_add_field('url_alias', 'source', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
     db_add_field('url_alias', 'alias', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
 
+    // Add the role_permisson table.
+    $schema['role_permission'] = drupal_get_schema_unprocessed('user', 'role_permission');
+    db_create_table('role_permission', $schema['role_permission']);
+    variable_set('update_d7_requirements', TRUE);
+
     // Add column for locale context.
     if (db_table_exists('locales_source')) {
       db_add_field('locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.'));
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.411
diff -u -p -r1.411 system.install
--- modules/system/system.install	24 Oct 2009 01:22:28 -0000	1.411
+++ modules/system/system.install	24 Oct 2009 01:31:37 -0000
@@ -2012,7 +2012,9 @@ function system_update_7007() {
     ),
   );
 
-  db_create_table('role_permission', $schema['role_permission']);
+  if (!db_table_exists('role_permission')) {
+    db_create_table('role_permission', $schema['role_permission']);
+  }
 
   // Copy the permissions from the old {permission} table to the new {role_permission} table.
   $messages = array();