summary refs log tree commit diff stats
path: root/ranger
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 /ranger
parent636f69d346e31ee59702c814574c1379aa9cb8e6 (diff)
downloadranger-ad482d30ff5564979c7789906cc53d4ed8920ae2.tar.gz
commands: don't ask for confirmation when deleting single links
Diffstat (limited to 'ranger')
-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)
150'>150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265