summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2012-08-10 16:20:00 +0200
committerhut <hut@lavabit.com>2012-08-10 16:20:00 +0200
commit60dcf60ac6c113faeb02ef7f6afdd0a39cd554d7 (patch)
tree3c84ad570ca947fdc12757103f642c08e34fd06b
parent8bd08cae83e091dce189ab8c84db468631c58e13 (diff)
parent60a6b7e639666051e8b7288b932498b19c299a00 (diff)
downloadranger-60dcf60ac6c113faeb02ef7f6afdd0a39cd554d7.tar.gz
Merge branch 'stable'
Conflicts:
	doc/ranger.1
	ranger/defaults/apps.py
-rw-r--r--CHANGELOG3
-rw-r--r--README2
-rw-r--r--doc/ranger.12
-rw-r--r--ranger/__init__.py2
-rw-r--r--ranger/core/runner.py2
5 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 79949eb2..03f3f03b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 This log documents changes between stable versions.
 
+2012-08-10: Version 1.5.5
+* Ensure that detached programs continue to run when ranger is killed
+
 2012-05-03: Version 1.5.4
 * Added exiftool to scope.sh by default
 * Fixed a crash when entering a directory with a unicode name
diff --git a/README b/README
index c0a1abb3..0b0cf9a7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-ranger v.1.5.4
+ranger v.1.5.5
 ==============
 ranger is a console file manager with VI key bindings.  It provides a
 minimalistic and nice curses interface with a view on the directory hierarchy.
diff --git a/doc/ranger.1 b/doc/ranger.1
index f199c67e..cfdbd455 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.5.4" "08/02/2012" "ranger manual"
+.TH RANGER 1 "ranger-1.5.5" "08/10/2012" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/ranger/__init__.py b/ranger/__init__.py
index d3c39946..ea94f53c 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -13,7 +13,7 @@ import os
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.5.4'
+__version__ = '1.5.5'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'romanz@lavabit.com'
 
diff --git a/ranger/core/runner.py b/ranger/core/runner.py
index 52c0b669..c5decf4c 100644
--- a/ranger/core/runner.py
+++ b/ranger/core/runner.py
@@ -165,6 +165,8 @@ class Runner(object):
 				popen_kws[key] = devnull_writable
 			popen_kws['stdin'] = devnull_readable
 		if 'd' in context.flags:
+			if not isinstance(action, str) and 'setsid' in get_executables():
+				action = ['setsid'] + action
 			toggle_ui = False
 			context.wait = False
 		if 'w' in context.flags: