summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-28 14:46:26 +0200
committerhut <hut@lavabit.com>2010-03-28 14:46:26 +0200
commitad482d30ff5564979c7789906cc53d4ed8920ae2 (patch)
tree318c9d6798f18d50392efde90b460779f03da879
parent636f69d346e31ee59702c814574c1379aa9cb8e6 (diff)
downloadranger-ad482d30ff5564979c7789906cc53d4ed8920ae2.tar.gz
commands: don't ask for confirmation when deleting single links
-rw-r--r--ranger/defaults/commands.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py
index b1518013..2443c0d5 100644
--- a/ranger/defaults/commands.py
+++ b/ranger/defaults/commands.py
@@ -277,8 +277,11 @@ class delete(Command):
 			# user did not confirm deletion
 			return
 
-		if self.fm.env.cwd.marked_items \
-		or (self.fm.env.cf.is_directory and not self.fm.env.cf.empty()):
+		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):
 			# 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)