Merge branch 'housekeeping_task' into 'master'

only run housekeeping on task 0 when --feeds is invoked with pidlock and task...

See merge request tt-rss/tt-rss!159

1 files changed, 3 insertions, 1 deletions

diff --git a/update.php b/update.php
index 9df6a0abe..9751aead1 100755
--- a/update.php
+++ b/update.php
@@ -201,7 +201,9 @@
 
 	if (isset($options["feeds"])) {
 		RSSUtils::update_daemon_common(Config::get(Config::DAEMON_FEED_LIMIT), $options);
-		RSSUtils::housekeeping_common();
+
+		if (!isset($options["pidlock"]) || $options["task"] == "0")
+			RSSUtils::housekeeping_common();
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, $options);
 	}