From 84dc120ee84b211db9f74f5a6e9d90afe5552349 Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Sat, 28 Nov 2015 13:01:43 +0100 Subject: [PATCH] Adding dirs with trailing slashes A bug prevented users to add conf dirs with trailing slashes. --- persoconf/main.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/persoconf/main.py b/persoconf/main.py index a9e7bb4..e387994 100755 --- a/persoconf/main.py +++ b/persoconf/main.py @@ -540,7 +540,17 @@ if args.command == "add": if args.confname: confname = args.confname else: - confname = os.path.basename(args.conf) + confname = args.conf + + # We need to remove trailing '/' because 'os.path.basename("toto/")' + # returns ''. And that's not cool. + while confname[-1] == "/": + confname = confname[:-1] # Remove trailing slashes + + confname = os.path.basename(confname) + + # Remove leading dots, so the name under which the conffile is saved is + # not hidden. while confname[0] == ".": confname = confname[1:] # Remove leading dots