Merge branch 'master' into preview

1 files changed, 3 insertions, 2 deletions

diff --git a/ranger.py b/ranger.py
index ccc9f0d6..f290d796 100755
--- a/ranger.py
+++ b/ranger.py
@@ -30,6 +30,8 @@ fi
 return 1
 """
 
+import sys
+
 # Redefine the docstring, since the previous one was hijacked to
 # embed a shellscript.
 __doc__ = """Ranger - file browser for the unix terminal"""
@@ -40,7 +42,6 @@ __doc__ = """Ranger - file browser for the unix terminal"""
 try:
 	from ranger.__main__ import main
 except ImportError:
-	import sys
 	if '-d' not in sys.argv and '--debug' not in sys.argv:
 		print("Can't import the main module.")
 		print("To run an uninstalled copy of ranger,")
@@ -48,4 +49,4 @@ except ImportError:
 	else:
 		raise
 else:
-	main()
+	sys.exit(main())