[med-svn] [Git][med-team/intake][master] Add patch for version 0.6.6 that should close bug #1044050

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / intake


Commits:
0cae1fab by Andreas Tille at 2023-12-10T21:39:23+01:00
Add patch for version 0.6.6 that should close bug #1044050

- - - - -


2 changed files:

- + debian/patches/84e22555aa415eb6a92c60b11d5f1e09d4737c54.patch
- debian/patches/series


Changes:

=====================================
debian/patches/84e22555aa415eb6a92c60b11d5f1e09d4737c54.patch
=====================================
@@ -0,0 +1,33 @@
+From: Martin Durant <martin.durant at alumni.utoronto.ca>
+Origin: https://github.com/intake/intake/pull/699
+Date: Tue, 10 Jan 2023 09:43:32 -0500
+Bug-Debian: https://bugs.debian.org/1044050
+Subject: [PATCH] Replace newlines in server error reason fields
+   This patch applies to 0.6.6
+
+---
+ intake/cli/server/server.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/intake/cli/server/server.py b/intake/cli/server/server.py
+index 0739435d2..07fece593 100644
+--- a/intake/cli/server/server.py
++++ b/intake/cli/server/server.py
+@@ -262,7 +262,7 @@ def post(self):
+                     raise tornado.web.HTTPError(
+                         status_code=400,
+                         log_message="Search query failed",
+-                        reason=str(err))
++                        reason=str(err).replace("\n", " "))
+                 self._cache.add(results_cat, source_id=query_source_id)
+             response = {'source_id': query_source_id}
+             self.write(msgpack.packb(response, **pack_kwargs))
+@@ -309,7 +309,7 @@ def post(self):
+                     traceback.print_exc()
+                     raise tornado.web.HTTPError(status_code=400,
+                                                 log_message="Discover failed",
+-                                                reason=str(e))
++                                                reason=str(e).replace("\n", " "))
+                 source_id = self._cache.add(source)
+                 logger.debug('Container: %s, ID: %s' % (source.container,
+                                                         source_id))


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ fix_privacy_breach.patch
 fix_tests.patch
 architectures-support.patch
 typo-in-manual-page.patch
+## 84e22555aa415eb6a92c60b11d5f1e09d4737c54.patch



View it on GitLab: https://salsa.debian.org/med-team/intake/-/commit/0cae1fabd805aed46e36bbf9ba4459b8631b02c1

-- 
View it on GitLab: https://salsa.debian.org/med-team/intake/-/commit/0cae1fabd805aed46e36bbf9ba4459b8631b02c1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231210/d5468285/attachment-0001.htm>