summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-31 06:28:55 +0200
committerhut <hut@lavabit.com>2010-03-31 06:28:55 +0200
commite2b8008ab1ea1d1d69dcb348f36ba3c28ef2cc6a (patch)
tree76dabd3a31f50c8b1b858c4469ff77fc0acbd7e8 /ranger
parentecd0d38655bc2029679cbca030c2e0118ea35f4c (diff)
downloadranger-e2b8008ab1ea1d1d69dcb348f36ba3c28ef2cc6a.tar.gz
defaults.commands: saner :delete confirmation check
Be 100% sure that the directory is empty to not ask for a confirmation
Diffstat (limited to 'ranger')
-rw-r--r--ranger/defaults/commands.py4
1 files 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)