Commit 236c9538 authored by Leigh Stoller's avatar Leigh Stoller

Fix to previous revision to deal with /q sillyness.

parent af628421
......@@ -4616,21 +4616,6 @@ class template:
argstr += str(argdict["guid"])
pass
elif argdict.has_key("path"):
try:
path = nfspath(argdict["path"]) # Scrub the path
# Make sure the path is accessible,
if not os.access(path, os.X_OK):
raise OSError(errno.EPERM, "Path is not accessible", path)
pass
except OSError, e:
retval = EmulabResponse(RESPONSE_ERROR,
value=e,
output=(e.strerror +
": " + e.filename))
return
argstr = "-q -f "
argstr += escapeshellarg(argdict["path"]);
pass
......@@ -4668,20 +4653,6 @@ class template:
return EmulabResponse(RESPONSE_BADARGS,
output="Improperly formed arguments")
try:
path = nfspath(argdict["path"]) # Scrub the path
# Make sure the path is accessible,
if not os.access(path, os.X_OK):
raise OSError(errno.EPERM, "Path is not accessible", path)
pass
except OSError, e:
retval = EmulabResponse(RESPONSE_ERROR,
value=e,
output=(e.strerror + ": " + e.filename))
pass
argstr = "-q -f " + escapeshellarg(argdict["path"])
argstr += " " + escapeshellarg(argdict["guid"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment