Rev 5534: Friendlier message while setting ownership of the ``.bazaar`` directory in http://bazaar.launchpad.net/~vila/bzr/integration/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Nov 9 09:18:28 GMT 2010
At http://bazaar.launchpad.net/~vila/bzr/integration/
------------------------------------------------------------
revno: 5534 [merge]
revision-id: v.ladeuil+lp at free.fr-20101109091828-g51hmayatqs32yu4
parent: v.ladeuil+lp at free.fr-20101108131056-ji7m8pg7n88bub75
parent: v.ladeuil+lp at free.fr-20101109091622-8ms4fhnvekin2l1k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Tue 2010-11-09 10:18:28 +0100
message:
Friendlier message while setting ownership of the ``.bazaar`` directory
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2010-09-16 09:52:29 +0000
+++ b/bzrlib/osutils.py 2010-11-06 02:32:43 +0000
@@ -967,7 +967,6 @@
# they tend to happen very early in startup when we can't check config
# files etc, and also we want to report all failures but not spam the user
# with 10 warnings.
- from bzrlib import trace
exception_str = str(exception)
if exception_str not in _extension_load_failures:
trace.mutter("failed to load compiled extension: %s" % exception_str)
@@ -1875,7 +1874,10 @@
s = os.stat(src)
chown(dst, s.st_uid, s.st_gid)
except OSError, e:
- trace.warning("Unable to copy ownership from '%s' to '%s': IOError: %s." % (src, dst, e))
+ trace.warning(
+ 'Unable to copy ownership from "%s" to "%s". '
+ 'You may want to set it manually.', src, dst)
+ trace.log_exception_quietly()
def path_prefix_key(path):
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt 2010-11-08 11:01:20 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt 2010-11-09 09:16:22 +0000
@@ -37,6 +37,9 @@
.. Fixes for situations where bzr would previously crash or give incorrect
or undesirable results.
+* Better message if there is an error while setting ownership of
+ ``.bazaar`` directory. (Parth Malwankar, #657553)
+
* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
is involved in a text conflict (but the conflict is still not
resolved). (Vincent Ladeuil, #646961)
More information about the bazaar-commits
mailing list