Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable
authorMatt Mackall <mpm@selenic.com>
Thu, 08 Oct 2009 00:59:46 -0500
changeset 9552 f0417b6ff98a
parent 9551 3e698434b990 (current diff)
parent 9533 e151b66bcf38 (diff)
child 9569 ceb0f59e1327
Merge with -stable
mercurial/util.py file | annotate | diff | comparison | revisions 
--- 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
mercurial