README.txt | 2 ++
bodhi/resources.py | 9 ++++++---
development.ini | 5 +++--
tools/pickledb.py | 7 +------
4 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 1fe843dd852c2e0a97c3c4afe873d770b40f3831
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 3 13:43:34 2011 -0400
Enable some debugging in our development config by default
diff --git a/development.ini b/development.ini
index adb4df9..fac620a 100644
--- a/development.ini
+++ b/development.ini
@@ -2,9 +2,10 @@
use = egg:bodhi
reload_templates = true
debug_authorization = false
-debug_notfound = false
-debug_routematch = false
+debug_notfound = true
+debug_routematch = true
debug_templates = true
+debug = true
default_locale_name = en
sqlalchemy.url = sqlite:///%(here)s/bodhi.db
mako.directories = bodhi:templates
commit 97e7bcc1c6e985bdc4a64c9018094b052c3f0d23
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 3 13:38:11 2011 -0400
Add a Comment resource
diff --git a/bodhi/resources.py b/bodhi/resources.py
index 6d15cad..122b060 100644
--- a/bodhi/resources.py
+++ b/bodhi/resources.py
@@ -3,7 +3,7 @@ import logging
from sqlalchemy.orm.exc import NoResultFound
from bodhi.models import initialize_sql, DBSession
-from bodhi.models import Update, Package, Build, Release, User, Bug
+from bodhi.models import Update, Package, Build, Release, User, Bug, Comment
log = logging.getLogger(__name__)
@@ -19,7 +19,6 @@ class BodhiRoot(object):
resource.__name__ = key
return resource
-
class BodhiResource(object):
__name__ = None
__parent__ = None
@@ -40,7 +39,6 @@ class BodhiResource(object):
except NoResultFound:
raise KeyError(key)
-
class PackageResource(BodhiResource):
__model__ = Package
__column__ = u'name'
@@ -66,6 +64,10 @@ class BugResource(BodhiResource):
__column__ = u'bug_id'
__filter__ = int
+class CommentResource(BodhiResource):
+ __model__ = Comment
+ __column__ = u'id'
+ __filter__ = int
root = BodhiRoot()
@@ -76,6 +78,7 @@ def default_get_root(request):
u'builds': BuildResource,
u'packages': PackageResource,
u'releases': ReleaseResource,
+ u'comments': CommentResource,
u'users': UserResource,
u'bugs': BugResource,
})
commit 6682a843e6ad8eb90e6682606293b407c5aefd79
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Sep 2 23:24:39 2011 -0400
Document migrating from bodhi 1 to 2
diff --git a/README.txt b/README.txt
index bcf9800..7f5946a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,6 @@
bodhi README
+Migrating Bodhi from v1.0 to v2.0
+PYTHONPATH=$(pwd) python tools/pickledb.py migrate bodhi-pickledb
diff --git a/tools/pickledb.py b/tools/pickledb.py
index 6241064..5bb5cf8 100755
--- a/tools/pickledb.py
+++ b/tools/pickledb.py
@@ -406,12 +406,7 @@ def main():
finally:
hub.commit()
elif sys.argv[1] == 'migrate' and len(sys.argv) == 3:
- try:
- #hub.begin()
- load_sqlalchemy_db()
- finally:
- pass
- #hub.commit()
+ load_sqlalchemy_db()
else:
usage()
Show replies by date