summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2017-03-04 22:08:31 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2017-03-04 22:08:31 +0100
commit7f909624a33e08866ac06e6c5308fa9e3f4a3ffe (patch)
tree0cc58e40407eec53fc49deac837813e4a7c984fc
parent7b9266785f83f7885f7c5dda2d761fa027078957 (diff)
downloadarchivist-7f909624a33e08866ac06e6c5308fa9e3f4a3ffe.tar.gz
archivist-7f909624a33e08866ac06e6c5308fa9e3f4a3ffe.tar.bz2
archivist-7f909624a33e08866ac06e6c5308fa9e3f4a3ffe.zip
Fixes
-rw-r--r--archivist/cli.py13
1 files 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)