diff --git a/buildout.cfg b/buildout.cfg index 644346d1b4e846528106f7ebb4ec1f08bc910edb..56113da5870e23d53aa0c8dc2aab51dbe00f6dcd 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -6,19 +6,14 @@ parts = external tests sphinx python newest = false develop = . -versions = versions eggs = bob xbob.db.replay - -[versions] -;If you would like to pin-down the recipes package version so you are not -;bothered with eventual updates, do it here. Note that, by pinning the version -;of the package, you will be also excluded from bug fixes. -;xbob.buildout = 0.1 +;bob = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release +bob = /Users/andre/work/bob/b/release/i [external] recipe = xbob.buildout:external -egg-directories = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release/lib +egg-directories = ${buildout:bob}/lib [tests] recipe = xbob.buildout:nose diff --git a/xbob/db/replay/checkfiles.py b/xbob/db/replay/checkfiles.py index 9ab3027fc970a0c11c5fd7be6cfa7c99ee597aeb..f56f722b9d01ddb681592b3229495bb9a03d594d 100644 --- a/xbob/db/replay/checkfiles.py +++ b/xbob/db/replay/checkfiles.py @@ -65,7 +65,7 @@ def add_command(subparsers): protocols = ('waiting','for','database','creation') clients = tuple() else: - protocols = [k.name for k in db.protos()] + protocols = [k.name for k in db.protocols()] clients = [k.id for k in db.clients()] parser.add_argument('-d', '--directory', dest="directory", default='', help="if given, this path will be prepended to every entry checked (defaults to '%(default)s')") diff --git a/xbob/db/replay/dumplist.py b/xbob/db/replay/dumplist.py index 85d93511767fd00533bbca5eb86d0fca792620c2..9f95dca271c1a3a45c893ff98a11bb761b4b4ddf 100644 --- a/xbob/db/replay/dumplist.py +++ b/xbob/db/replay/dumplist.py @@ -52,7 +52,7 @@ def add_command(subparsers): protocols = ('waiting','for','database','creation') clients = tuple() else: - protocols = [k.name for k in db.protos()] + protocols = [k.name for k in db.protocols()] clients = [k.id for k in db.clients()] parser.add_argument('-d', '--directory', dest="directory", default='', help="if given, this path will be prepended to every entry returned (defaults to '%(default)s')") diff --git a/xbob/db/replay/query.py b/xbob/db/replay/query.py index c13b1c37fcce364d71caa9913f7e472fad235f93..61849eb2be6e9672fdeb6e8d905934e3b7788c5f 100644 --- a/xbob/db/replay/query.py +++ b/xbob/db/replay/query.py @@ -114,7 +114,7 @@ class Database(object): # check protocol validity if not protocol: protocol = 'grandtest' #default - VALID_PROTOCOLS = [k.name for k in self.protos()] + VALID_PROTOCOLS = [k.name for k in self.protocols()] if protocol not in VALID_PROTOCOLS: raise RuntimeError, 'Invalid protocol "%s". Valid values are %s' % \ (protocol, VALID_PROTOCOLS)