Mercurial > public > mercurial-scm > hg-stable

diff mercurial/util.py @ 9552:f0417b6ff98a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Oct 2009 00:59:46 -0500
parents 8b8920209317 ba8a86d86fd6
children ceb0f59e1327
line wrap: on
line diff
--- a/mercurial/util.py	Wed Oct 07 14:01:20 2009 -0500
+++ b/mercurial/util.py	Thu Oct 08 00:59:46 2009 -0500
@@ -1221,6 +1221,11 @@
                 return array.array('h', arri)[1]
             except ValueError:
                 pass
+            except IOError, e: 
+                if e[0] == errno.EINVAL: 
+                    pass 
+                else: 
+                    raise 
     except ImportError:
         pass
     return 80