From 400c9ad26996d246634e158fc881deab04e57be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arno=20T=C3=B6ll?= Date: Thu, 15 Mar 2012 19:27:54 -0400 Subject: [PATCH 1/6] Fix broken link --- debexpo/config/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debexpo/config/routing.py b/debexpo/config/routing.py index 132dd467..6a76a1bd 100644 --- a/debexpo/config/routing.py +++ b/debexpo/config/routing.py @@ -80,7 +80,7 @@ def make_map(config): map.connect('sponsor', '/package/{packagename}/needs_sponsor/{key}', controller='package', action='sponsor') map.connect('subscribe', '/package/{packagename}/subscribe', controller='package', action='subscribe') map.connect('delete', '/package/{packagename}/delete/{key}', controller='package', action='delete') - map.connect('rfs', '/sponsors/rfs-howto', controller='sponsor', action='rfs_howto') + map.connect('rfs-howto', '/sponsors/rfs-howto', controller='sponsor', action='rfs_howto') map.connect('rfs', '/sponsors/rfs-howto/{packagename}', controller='sponsor', action='rfs_howto') map.connect('packages', '/packages/{action}', controller='packages', action='index') map.connect('all-packages', '/packages', controller='packages', action='index') -- GitLab From d0a002a6f699c7f38f3b115fee3f431e17625235 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Sun, 25 Mar 2012 18:45:51 +0200 Subject: [PATCH 2/6] Fix DeprecationWarning for BaseException.message This addresses Bug [#313274] --- debexpo/lib/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debexpo/lib/plugins.py b/debexpo/lib/plugins.py index ccfb5031..93912ac8 100644 --- a/debexpo/lib/plugins.py +++ b/debexpo/lib/plugins.py @@ -115,7 +115,7 @@ class Plugins(object): log.debug('Import succeeded.') return mod except ImportError, e: - if e.message.startswith('No module named'): + if str(e).startswith('No module named'): # Not fatal: the plugin module was not found at this location # (might be okay because plugins are looked for in several locations) log.debug('Import failed - module not found: %s', e) -- GitLab From f6a29b6aa011f64fafac608e329c919efa8cb324 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Sun, 25 Mar 2012 20:21:07 +0200 Subject: [PATCH 3/6] Use h.url for all links in base.mako Thanks to Satoru KURASHIKI for the bug report --- debexpo/templates/base.mako | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debexpo/templates/base.mako b/debexpo/templates/base.mako index ca981b4c..28a20711 100644 --- a/debexpo/templates/base.mako +++ b/debexpo/templates/base.mako @@ -3,9 +3,9 @@ - - - + + + ${ c.config['debexpo.sitename'] } % if c.feed_url: @@ -108,7 +108,7 @@ ${ h.tags.link_to( _('Contact'), h.url('contact')) } % if 'user_id' in session: - - Logout + Logout % endif % if c.feed_url: -- GitLab From 380009388eff0999bc72c0c2abbb00165be09fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arno=20T=C3=B6ll?= Date: Sun, 25 Mar 2012 14:59:51 -0400 Subject: [PATCH 4/6] Add a warning that we deliver static content not through a controller --- debexpo/config/routing.py | 2 ++ debexpo/controllers/debian.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debexpo/config/routing.py b/debexpo/config/routing.py index 6a76a1bd..21bf3d69 100644 --- a/debexpo/config/routing.py +++ b/debexpo/config/routing.py @@ -56,6 +56,8 @@ def make_map(config): # CUSTOM ROUTES HERE + # n.b.: chances are, this route is overriden by a productive setup in its + # web server configuration if config['debexpo.handle_debian'].lower() == 'true': map.connect('/debian/*filename', controller='debian', action='index') diff --git a/debexpo/controllers/debian.py b/debexpo/controllers/debian.py index 7d80299f..d30376ec 100644 --- a/debexpo/controllers/debian.py +++ b/debexpo/controllers/debian.py @@ -31,6 +31,12 @@ This module holds the Debian controller which manages the /debian/ directory. """ +# +# XXX: This controller is ONLY used if no standalone web server is running. +# For productive setups it is suggested to deliver static content through +# the web server (e.g. Apache) directly +# + __author__ = 'Jonny Lamb' __copyright__ = 'Copyright © 2008 Jonny Lamb' __license__ = 'MIT' -- GitLab From 374ab7c943d5d058daa507447a59cacd8c07d38e Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Sun, 25 Mar 2012 21:25:15 +0200 Subject: [PATCH 5/6] Fix typo for the "bts" command in the rfs-howto Thanks to Fernando Lemos for the report --- debexpo/templates/sponsor/rfs_howto.mako | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debexpo/templates/sponsor/rfs_howto.mako b/debexpo/templates/sponsor/rfs_howto.mako index 88bcfc09..be501c49 100644 --- a/debexpo/templates/sponsor/rfs_howto.mako +++ b/debexpo/templates/sponsor/rfs_howto.mako @@ -200,8 +200,7 @@ can use the following tags to indicate progress:

is ready for upload, please consider setting yourself as the owner of the bug and tag the bug pending:

-$ bts owner nnn me@example.com
-$ bts nnn tag +pending +$ bts owner nnn me@example.com , tag it + pending

Uploading Packages

-- GitLab From 52ee4b207a4676084a9844740b00d16e73dc23b0 Mon Sep 17 00:00:00 2001 From: Baptiste BEAUPLAT Date: Sun, 28 Oct 2018 16:59:19 +0100 Subject: [PATCH 6/6] Replace e.message by str(e) to avoid python warning --- bin/debexpo_importer.py | 2 +- bin/debexpo_worker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/debexpo_importer.py b/bin/debexpo_importer.py index 83263468..3688e2f5 100755 --- a/bin/debexpo_importer.py +++ b/bin/debexpo_importer.py @@ -404,7 +404,7 @@ class Importer(object): except Exception as e: # XXX: The user won't ever see this message. The changes file was # invalid, we don't know whom send it to - self._reject("Your changes file appears invalid. Refusing your upload\n%s" % (e.message)) + self._reject("Your changes file appears invalid. Refusing your upload\n%s" % (str(e))) diff --git a/bin/debexpo_worker.py b/bin/debexpo_worker.py index eaf02456..44c08179 100755 --- a/bin/debexpo_worker.py +++ b/bin/debexpo_worker.py @@ -116,7 +116,7 @@ class Worker(object): log.debug('Import succeeded.') return mod except ImportError as e: - if e.message.startswith('No module named'): + if str(e).startswith('No module named'): log.debug('Import failed - module not found: %s', e) else: log.warn('Import of module "%s" failed with error: %s', name, e) -- GitLab