? 916962-1_reschedule.patch
? 916962-4_reschedule.patch
? 916962-4_reschedule.patch.1
? 916962-6_reschedule.patch
? 919172-1_dont_delete.patch
? 919172-2_dont_delete.patch
? libraries/simplepie.inc
? tests/.DS_Store
Index: feeds.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/feeds.install,v
retrieving revision 1.13
diff -u -p -r1.13 feeds.install
--- feeds.install	16 Sep 2010 18:46:38 -0000	1.13
+++ feeds.install	25 Sep 2010 14:46:08 -0000
@@ -537,7 +537,7 @@ function feeds_update_6011() {
 }
 
 /**
- * Drop schedule table and reschedule all tasks, install Job Scheduler module.
+ * Drop schedule table install Job Scheduler module.
  */
 function feeds_update_6012() {
   $ret = array();
@@ -554,6 +554,16 @@ function feeds_update_6012() {
     drupal_set_message(t('NOTE: Please install new dependency of Feeds: !job_scheduler module.', array('!job_scheduler' => l(t('Job Scheduler'), 'http://drupal.org/project/job_scheduler'))), 'warning');
   }
   db_drop_table($ret, 'feeds_schedule');
-  feeds_reschedule(TRUE);
   return $ret;
 }
+
+/**
+ * Reschedule all tasks.
+ */
+function feeds_update_6013() {
+  // This was originally part of 6012 upgrade, but failed due to usage of
+  // API functions residing in feeds.module. Make sure it runs again for all
+  // users of Feeds.
+  variable_set('feeds_reschedule', TRUE);
+  return array();
+}
Index: feeds.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/feeds.module,v
retrieving revision 1.55
diff -u -p -r1.55 feeds.module
--- feeds.module	15 Sep 2010 19:27:42 -0000	1.55
+++ feeds.module	25 Sep 2010 14:46:08 -0000
@@ -89,9 +89,9 @@ function feeds_importer_expire($job) {
 /**
  * Reschedule one or all importers.
  *
- * Note: feeds_reschedule() is used in update hook feeds_update_6012() and as
- * such must be maintained as part of the upgrade path from pre 6.x 1.0 beta 6
- * versions of Feeds.
+ * Note: variable_set('feeds_reschedule', TRUE) is used in update hook
+ * feeds_update_6013() and as such must be maintained as part of the upgrade
+ * path from pre 6.x 1.0 beta 6 versions of Feeds.
  *
  * @param $importer_id
  *   If TRUE, all importers will be rescheduled, if FALSE, no importers will