From ad482d30ff5564979c7789906cc53d4ed8920ae2 Mon Sep 17 00:00:00 2001 From: hut Date: Sun, 28 Mar 2010 14:46:26 +0200 Subject: commands: don't ask for confirmation when deleting single links --- ranger/defaults/commands.py | 7 +++++-- 1 file 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) -- cgit 1.4.1-2-gfad0