Merge pull request #949 from dkliban/fix-cancel-rsync-publish

Removes cancel_publish_repo methods from the rsync distributors re #1963 https://pulp.plan.io/issues/1963 re #1759 https://pulp.plan.io/issues/1759
pulp · Jul 31, 2016 · 0e8efde · 0e8efde
2 parents e007ad2 + 65bce7f
commit 0e8efde
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/plugins/pulp_rpm/plugins/distributors/iso_rsync_distributor/distributor.py b/plugins/pulp_rpm/plugins/distributors/iso_rsync_distributor/distributor.py
@@ -94,12 +94,3 @@ def publish_repo(self, repo, publish_conduit, config):
         self._publisher = publish.ISORsyncPublisher(repo, publish_conduit, config,
                                                     TYPE_ID_DISTRIBUTOR_ISO_RSYNC)
         return self._publisher.publish()
-
-    def cancel_publish_repo(self):
-        """
-        Call cancellation control hook.
-        """
-        _LOG.debug(_('Canceling publishing repo to remote server'))
-        self.canceled = True
-        if self._publisher is not None:
-            self._publisher.cancel()
diff --git a/plugins/pulp_rpm/plugins/distributors/rsync/distributor.py b/plugins/pulp_rpm/plugins/distributors/rsync/distributor.py
@@ -101,14 +101,3 @@ def publish_repo(self, repo, publish_conduit, config):
         self._publisher = publish.RPMRsyncPublisher(repo, publish_conduit, config,
                                                     TYPE_ID_DISTRIBUTOR_RPM_RSYNC)
         return self._publisher.publish()
-
-    def cancel_publish_repo(self):
-        """
-        Call cancellation control hook.
-
-        """
-        _LOG.debug(_('Canceling publishing repo to remote server'))
-
-        self.canceled = True
-        if self._publisher is not None:
-            self._publisher.cancel()