Rev 6046: (mbp) log a message when we get a EINVAL on a transport operation (Martin in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Jul 27 03:03:53 UTC 2011


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6046 [merge]
revision-id: pqm at pqm.ubuntu.com-20110727030349-wcq2ay0knn995ae4
parent: pqm at pqm.ubuntu.com-20110725140128-croovh96z0rs57yy
parent: mbp at canonical.com-20110725060935-mpby5sq2xa4jyb1u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-07-27 03:03:49 +0000
message:
  (mbp) log a message when we get a EINVAL on a transport operation (Martin
   Pool)
modified:
  bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- a/bzrlib/doc_generate/autodoc_man.py	2010-11-06 10:55:58 +0000
+++ b/bzrlib/doc_generate/autodoc_man.py	2011-07-22 00:03:11 +0000
@@ -186,10 +186,14 @@
 .B "help"
 .I "command"
 .SH "DESCRIPTION"
-Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an free
-distributed version control system that is powerful, friendly, and scalable.
-Version control means a system that keeps track of previous revisions
-of software source code or similar information and helps people work on it in teams.
+
+Bazaar (or %(bzrcmd)s) is a distributed version control system that is powerful, 
+friendly, and scalable.  Bazaar is a project of Canonical Ltd and part of 
+the GNU Project to develop a free operating system.
+
+Bazaar keeps track of changes to software source code (or similar information);
+lets you explore who changed it, when, and why; merges concurrent changes; and
+helps people work together in a team.
 """
 
 man_foot = """\

=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2011-07-25 11:19:19 +0000
+++ b/bzrlib/transport/__init__.py	2011-07-27 03:03:49 +0000
@@ -294,7 +294,10 @@
         This handles things like ENOENT, ENOTDIR, EEXIST, and EACCESS
         """
         if getattr(e, 'errno', None) is not None:
-            if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
+            if e.errno in (errno.ENOENT, errno.ENOTDIR):
+                raise errors.NoSuchFile(path, extra=e)
+            elif e.errno == errno.EINVAL:
+                mutter("EINVAL returned on path %s: %s" % (path, e))
                 raise errors.NoSuchFile(path, extra=e)
             # I would rather use errno.EFOO, but there doesn't seem to be
             # any matching for 267




More information about the bazaar-commits mailing list