From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 19 Oct 2015 17:24:33 +0000 (+0100)
Subject: Fix check for initial '-' in argv_to_abspath.
X-Git-Url: https://git.rkrishnan.org/pf?a=commitdiff_plain;h=48aef42644eec4d6fbf115bdce246e7f4bb7b743;p=tahoe-lafs%2Ftahoe-lafs.git

Fix check for initial '-' in argv_to_abspath.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/util/encodingutil.py b/src/allmydata/util/encodingutil.py
index 14751205..f97c4822 100644
--- a/src/allmydata/util/encodingutil.py
+++ b/src/allmydata/util/encodingutil.py
@@ -95,15 +95,17 @@ def argv_to_unicode(s):
     except UnicodeDecodeError:
         raise usage.UsageError("Argument %s cannot be decoded as %s." %
                                (quote_output(s), io_encoding))
-    if local_dir.startswith('-'):
-        raise usage.UsageError("Argument %s cannot start with a -." % (quote_output(s),))
 
 def argv_to_abspath(s):
     """
     Convenience function to decode an argv element to an absolute path, with ~ expanded.
     If this fails, raise a UsageError.
     """
-    return abspath_expanduser_unicode(argv_to_unicode(s))
+    decoded = argv_to_unicode(s)
+    if decoded.startswith(u'-'):
+        raise usage.UsageError("Path argument %s cannot start with '-'.\nUse %s if you intended to refer to a file."
+                               % (quote_output(s), quote_output(os.path.join('.', s))))
+    return abspath_expanduser_unicode(decoded)
 
 def unicode_to_argv(s, mangle=False):
     """