From e2b8008ab1ea1d1d69dcb348f36ba3c28ef2cc6a Mon Sep 17 00:00:00 2001 From: hut Date: Wed, 31 Mar 2010 06:28:55 +0200 Subject: defaults.commands: saner :delete confirmation check Be 100% sure that the directory is empty to not ask for a confirmation --- ranger/defaults/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py index a2e96afb..638cc031 100644 --- a/ranger/defaults/commands.py +++ b/ranger/defaults/commands.py @@ -281,8 +281,8 @@ class delete(Command): cwd = self.fm.env.cwd cf = self.fm.env.cf - if cwd.marked_items or \ - (cf.is_directory and not cf.empty() and not cf.islink): + if cwd.marked_items or (cf.is_directory and not cf.islink \ + and len(os.listdir(cf.path)) > 0): # better ask for a confirmation, when attempting to # delete multiple files or a non-empty directory. return self.fm.open_console(self.mode, delete.WARNING) -- cgit 1.4.1-2-gfad0