From 4976ebe5352d79605bcf358374ddff7a94fbf472 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Fri, 15 Jun 2012 13:07:17 +0300 Subject: [PATCH 1/2] Only need one command to create sysadmin user 'harvest', if user does not exist it will be created --- README.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 57e6cdb..1a28e3c 100644 --- a/README.rst +++ b/README.rst @@ -36,9 +36,7 @@ Run the following command to create the necessary tables in the database:: paster --plugin=ckanext-harvest harvester initdb --config=mysite.ini The extension needs a user with sysadmin privileges to perform the -harvesting jobs. You can create such a user running these two commands:: - - paster --plugin=ckan user add harvest +harvesting jobs. You can create such a user running this command:: paster --plugin=ckan sysadmin add harvest From 528e98120c6287468f4281cad0213ab4317313ef Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Fri, 15 Jun 2012 12:08:35 +0200 Subject: [PATCH 2/2] [#2533] Fix some imports broken by ckan cleanups --- ckanext/harvest/model/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ckanext/harvest/model/__init__.py b/ckanext/harvest/model/__init__.py index 79b73e1..7ff90f1 100644 --- a/ckanext/harvest/model/__init__.py +++ b/ckanext/harvest/model/__init__.py @@ -3,12 +3,15 @@ import datetime from sqlalchemy import event from sqlalchemy import distinct +from sqlalchemy import Table +from sqlalchemy import Column +from sqlalchemy import ForeignKey +from sqlalchemy import types from sqlalchemy.engine.reflection import Inspector from sqlalchemy.orm import backref, relation from ckan import model -from ckan.model.meta import (metadata, mapper, Session, - Table, Column, ForeignKey, types) +from ckan.model.meta import metadata, mapper, Session from ckan.model.types import make_uuid from ckan.model.domain_object import DomainObject from ckan.model.package import Package