From 3b1fff9ff90c61cfdca2368c5e71d735e6a42ed2 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Tue, 20 Mar 2012 21:17:34 +0000 Subject: [PATCH 1/2] Fix paster create -t ckanext ... This command was crashing, complaining that it couldn't find an egg-info dir. It looks like there needs to be an empty directory at: ckan/pastertemplates/template/ckanext_+project+.egg-info/ Since git doesn't track empty directories, I think this might have been lost in the move from hg to git? --- .../template/ckanext_+project+.egg-info/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore diff --git a/ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore b/ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore new file mode 100644 index 00000000000..e69de29bb2d From 163ea7bb8024c5706ddf1858c81185b0eb2e1c0e Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Wed, 21 Mar 2012 08:41:34 +0000 Subject: [PATCH 2/2] [master,bugfix,routing][xs]: correct bug introduced in f82f3b9acd8a4dc82813a163511e87cf706681ac whereby conditions for datastore write were GET/POST/DELETE rather than PUT/POST/DELETE. --- ckan/config/routing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 36c5b628584..f36dc3b2027 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -25,7 +25,7 @@ def make_map(): DELETE = dict(method=['DELETE']) GET_POST = dict(method=['GET', 'POST']) PUT_POST = dict(method=['PUT','POST']) - GET_POST_DELETE = dict(method=['GET', 'POST', 'DELETE']) + PUT_POST_DELETE = dict(method=['PUT', 'POST', 'DELETE']) OPTIONS = dict(method=['OPTIONS']) from ckan.lib.plugins import register_package_plugins @@ -139,7 +139,7 @@ def make_map(): m.connect('datastore_read', '/api/data/{id}{url:(/.*)?}', action='read', url='', conditions=GET) m.connect('datastore_write', '/api/data/{id}{url:(/.*)?}', - action='write', url='', conditions=GET_POST_DELETE) + action='write', url='', conditions=PUT_POST_DELETE) map.redirect('/packages', '/dataset')