From a8a11960ea4594f75525208ff0ee40e41ed92b16 Mon Sep 17 00:00:00 2001 From: Rene Schneider Date: Thu, 30 Mar 2017 15:59:45 +0200 Subject: [PATCH] [issue #2680]: Scheduled RPM (un)installation does not work (#2980) fixes #2680 Scheduled RPM (un)installation does not work added myself to the AUTHORS file as requested by bmbouter --- AUTHORS | 1 + server/pulp/server/controllers/consumer.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index acc5f1106b..6078065400 100644 --- a/AUTHORS +++ b/AUTHORS @@ -40,6 +40,7 @@ Dan Radez (dradez@redhat.com) Jason E. Rist (jrist@redhat.com) Jesus M. Rodriguez (jesusr@redhat.com) Todd Sanders (tsanders@redhat.com) +Rene Schneider (slartie@posteo.de) Justin Sherrill (jsherril@redhat.com) James Slagle (jslagle@redhat.com) Chris St. Pierre (chris.a.st.pierre@gmail.com) diff --git a/server/pulp/server/controllers/consumer.py b/server/pulp/server/controllers/consumer.py index c5455c4fe3..45a950c93c 100644 --- a/server/pulp/server/controllers/consumer.py +++ b/server/pulp/server/controllers/consumer.py @@ -125,7 +125,7 @@ def force_unbind(consumer_id, repo_id, distributor_id, options): @celery.task(base=Task, name='pulp.server.tasks.consumer.install_content') -def install_content(consumer_id, units, options): +def install_content(consumer_id, units, options, scheduled_call_id=None): """ Install units on a consumer @@ -135,6 +135,8 @@ def install_content(consumer_id, units, options): :type units: list or tuple :param options: options to pass to the install manager :type options: dict or None + :param scheduled_call_id: id of scheduled call that dispatched this task + :type scheduled_call_id: str :returns Dictionary representation of a task status :rtype: dictionary """ @@ -163,7 +165,7 @@ def update_content(consumer_id, units, options, scheduled_call_id=None): @celery.task(base=Task, name='pulp.server.tasks.consumer.uninstall_content') -def uninstall_content(consumer_id, units, options): +def uninstall_content(consumer_id, units, options, scheduled_call_id=None): """ Uninstall content from a consumer. @@ -173,6 +175,8 @@ def uninstall_content(consumer_id, units, options): :type units: list or tuple :param options: options to pass to the install manager :type options: dict or None + :param scheduled_call_id: id of scheduled call that dispatched this task + :type scheduled_call_id: str :returns Dictionary representation of a task status :rtype: dictionary """