summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-04-26 21:49:23 +0200
committerhut <hut@lavabit.com>2011-04-26 21:49:23 +0200
commit9a99feacea7297f8478e111d8731a4411ad6c1a5 (patch)
tree0bbcc0abbda04b8e109ada488172c24ad5411e22
parent3e2d6f2f3d4e6f8c71db73a26320bf0699671ba1 (diff)
parent2ed2d4f79238ce505724fc5873c6a912e19be305 (diff)
downloadranger-9a99feacea7297f8478e111d8731a4411ad6c1a5.tar.gz
Merge branch 'stable'
Conflicts:
	ranger.py
-rw-r--r--CHANGELOG5
-rw-r--r--README2
-rw-r--r--doc/ranger.12
-rwxr-xr-xranger.py2
-rw-r--r--ranger/__init__.py2
5 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7661ca1e..f934591d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,11 @@ Stable versions are identifiable (since 1.2) through their even minor
 version number, like 1.2.x, 1.4.x, etc.  Odd minor version numbers
 are used for rolling-release git snapshots.
 
+2011-04-05: Version 1.4.3
+* Fixed mimetype checking when invoking ranger with a filename
+* Fixed loss of bookmarks when disk is full
+* Minor improvements
+
 2011-03-05: Version 1.4.2
 * Added --choosefile and --choosedir flag
 * Added use of bookmarks in tab completion of the :cd command
diff --git a/README b/README
index bd960d47..2b46411f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ranger v.1.4.2
+Ranger v.1.4.3
 ==============
 
 Ranger is a free console file manager that gives you greater flexibility
diff --git a/doc/ranger.1 b/doc/ranger.1
index beb580c6..5b9d9df8 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -1,4 +1,4 @@
-.TH RANGER 1 ranger-1.4.2
+.TH RANGER 1 ranger-1.4.3
 .SH NAME
 ranger - visual file manager
 .\"-----------------------------------------
diff --git a/ranger.py b/ranger.py
index 16c6b1b5..ffdf13aa 100755
--- a/ranger.py
+++ b/ranger.py
@@ -51,7 +51,7 @@ __doc__ = """Ranger - file browser for the unix terminal"""
 if os.path.isdir('ranger'):
 	try:
 		sys.path.remove(os.path.abspath('.'))
-	except ValueError:
+	except:
 		pass
 
 # Start ranger
diff --git a/ranger/__init__.py b/ranger/__init__.py
index 88117f6c..03a1d2da 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -29,7 +29,7 @@ from ranger.core.main import main
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.4.2'
+__version__ = '1.4.3'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'romanz@lavabit.com'