[pycsw] 04/04: Removed pycsw-root patch after being included in 2.0.1
Angelos Tzotsos
kalxas-guest at moszumanska.debian.org
Mon Sep 12 09:00:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
kalxas-guest pushed a commit to branch master
in repository pycsw.
commit d894d95ffeaed20fb1d56d3b95e42f45e6c20819
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
Date: Mon Sep 12 11:59:58 2016 +0300
Removed pycsw-root patch after being included in 2.0.1
---
debian/patches/pycsw-root.patch | 35 -----------------------------------
debian/patches/series | 1 -
2 files changed, 36 deletions(-)
diff --git a/debian/patches/pycsw-root.patch b/debian/patches/pycsw-root.patch
deleted file mode 100644
index a5c9273..0000000
--- a/debian/patches/pycsw-root.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Support overriding PYCSW_ROOT via environment variable.
- Relative paths from wsgi.py to tests are different between build and
- installation environment. The defaults work for the build environment only.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/geopython/pycsw/pull/449
-Applied-Upstream: https://github.com/geopython/pycsw/commit/1525e70d36e363a856f03988ceb1598ba00d87f0
-
---- a/pycsw/wsgi.py
-+++ b/pycsw/wsgi.py
-@@ -70,18 +70,23 @@ def application(env, start_response):
- if 'PYCSW_CONFIG' in env:
- config = env['PYCSW_CONFIG']
-
-+ root = PYCSW_ROOT
-+
-+ if 'PYCSW_ROOT' in env:
-+ root = env['PYCSW_ROOT']
-+
- if env['QUERY_STRING'].lower().find('config') != -1:
- for kvp in env['QUERY_STRING'].split('&'):
- if kvp.lower().find('config') != -1:
- config = unquote(kvp.split('=')[1])
-
- if not os.path.isabs(config):
-- config = os.path.join(PYCSW_ROOT, config)
-+ config = os.path.join(root, config)
-
- if 'HTTP_HOST' in env and ':' in env['HTTP_HOST']:
- env['HTTP_HOST'] = env['HTTP_HOST'].split(':')[0]
-
-- env['local.app_root'] = PYCSW_ROOT
-+ env['local.app_root'] = root
-
- csw = server.Csw(config, env)
-
diff --git a/debian/patches/series b/debian/patches/series
index e9bdbc2..6c39d05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
0006-Don-t-include-external-references-to-images.patch
pavement.patch
offline-tests.patch
-pycsw-root.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git
More information about the Pkg-grass-devel
mailing list