import os.path
import codecs
+
+from allmydata.util.assertutil import precondition
+
from allmydata import uri
from allmydata.scripts.common_http import do_http, check_http_error
from allmydata.scripts.common import get_aliases
def add_alias(options):
nodedir = options['node-directory']
alias = options.alias
+ precondition(isinstance(alias, unicode), alias=alias)
cap = options.cap
stdout = options.stdout
stderr = options.stderr
- assert ":" not in alias
- assert " " not in alias
+ if u":" in alias:
+ # a single trailing colon will already have been stripped if present
+ print >>stderr, "Alias names cannot contain colons."
+ return 1
+ if u" " in alias:
+ print >>stderr, "Alias names cannot contain spaces."
+ return 1
old_aliases = get_aliases(nodedir)
if alias in old_aliases:
# mkdir+add_alias
nodedir = options['node-directory']
alias = options.alias
+ precondition(isinstance(alias, unicode), alias=alias)
stdout = options.stdout
stderr = options.stderr
- assert ":" not in alias
- assert " " not in alias
+ if u":" in alias:
+ # a single trailing colon will already have been stripped if present
+ print >>stderr, "Alias names cannot contain colons."
+ return 1
+ if u" " in alias:
+ print >>stderr, "Alias names cannot contain spaces."
+ return 1
old_aliases = get_aliases(nodedir)
if alias in old_aliases: