From 7f909624a33e08866ac06e6c5308fa9e3f4a3ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 4 Mar 2017 22:08:31 +0100 Subject: Fixes --- archivist/cli.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/archivist/cli.py b/archivist/cli.py index 45a8f09..2e0fbfd 100644 --- a/archivist/cli.py +++ b/archivist/cli.py @@ -93,13 +93,10 @@ class PrefixTagType(click.ParamType): def convert(self, value, param, ctx): try: - prefix, tag = value.split(':') - if not tag: - return PrefixTag(prefix) - - return PrefixTag(tag, prefix) + prefix, tag = value.split(':', 1) except ValueError: - self.fail("%s is an invalid tag. Correct form '[prefix:]tag'." % value, param, ctx) + return PrefixTag(value) + return PrefixTag(tag, prefix) TAG = PrefixTagType() @@ -109,8 +106,8 @@ def create_tag(name, description=None): if name.prefix: prefix, created = Prefix.get_or_create(name = name.prefix) - if not created and prefix.pseudo: - raise click.UsageError("Prefix '%s' is not allowed to carry additional tags." % name.prefix) + if not created and prefix.virtual: + raise click.UsageError("Prefix '%s' is not allowed to carry additional tags." % name.prefix) return Tag.create_or_get(name = name.tag, prefix = name.prefix, description = description) -- cgit v1.2.3