Rev 2852: Rebuild solaris branch with fix in file:///v/home/vila/src/bzr/bugs/solaris.clean/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Sep 24 11:26:27 BST 2007
At file:///v/home/vila/src/bzr/bugs/solaris.clean/
------------------------------------------------------------
revno: 2852
revision-id: v.ladeuil+lp at free.fr-20070924102624-fr91w3l0k29j0lnc
parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
parent: v.ladeuil+lp at free.fr-20070920112118-0k7avppujuqst80l
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: solaris.clean
timestamp: Mon 2007-09-24 12:26:24 +0200
message:
Rebuild solaris branch with fix
modified:
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
revno: 2823.1.6
revision-id: v.ladeuil+lp at free.fr-20070920112118-0k7avppujuqst80l
parent: v.ladeuil+lp at free.fr-20070918195413-tvaw2iv02yov1wtd
parent: pqm at pqm.ubuntu.com-20070920110135-652zsvb2su692bie
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Thu 2007-09-20 13:21:18 +0200
message:
Merge bzr.dev
added:
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2823.1.5
revision-id: v.ladeuil+lp at free.fr-20070918195413-tvaw2iv02yov1wtd
parent: v.ladeuil+lp at free.fr-20070917163735-uqwnnoxmhlk3qud5
parent: pqm at pqm.ubuntu.com-20070918045733-es6jch43pxvogvhj
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Tue 2007-09-18 21:54:13 +0200
message:
merge bzr.dev
added:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2823.1.4
revision-id: v.ladeuil+lp at free.fr-20070917163735-uqwnnoxmhlk3qud5
parent: v.ladeuil+lp at free.fr-20070917163522-c935qgh696dpac16
parent: v.ladeuil+lp at free.fr-20070917154823-kbnjfgrhn0fihylk
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Mon 2007-09-17 18:37:35 +0200
message:
merge fix for 140055
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 2823.1.3
revision-id: v.ladeuil+lp at free.fr-20070917163522-c935qgh696dpac16
parent: v.ladeuil+lp at free.fr-20070914173728-8sd76vfuged63d5e
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Mon 2007-09-17 18:35:22 +0200
message:
Simpler fix.
* bzrlib/transport/local.py:
(LocalTransport.rmdir): Simplified (doh).
modified:
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
revno: 2823.1.2
revision-id: v.ladeuil+lp at free.fr-20070914173728-8sd76vfuged63d5e
parent: v.ladeuil+lp at free.fr-20070914173630-58mn9wki0y0eta5r
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Fri 2007-09-14 19:37:28 +0200
message:
Fix LocalTransport rmdir for Solaris, raising the right exception.
* bzrlib/transport/local.py:
(LocalTransport.rmdir): Reraise DirectoryNotEmpty instead of
FileExists.
modified:
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
revno: 2823.1.1
revision-id: v.ladeuil+lp at free.fr-20070914173630-58mn9wki0y0eta5r
parent: pqm at pqm.ubuntu.com-20070914082550-j9aknobh4x00qksk
parent: v.ladeuil+lp at free.fr-20070914140020-edb8ahp9hpkwv3j2
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Fri 2007-09-14 19:36:30 +0200
message:
Merge fix for #59150.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
------------------------------------------------------------
revno: 2823.2.1
revision-id: v.ladeuil+lp at free.fr-20070914140020-edb8ahp9hpkwv3j2
parent: pqm at pqm.ubuntu.com-20070914082550-j9aknobh4x00qksk
parent: v.ladeuil+lp at free.fr-20070914111435-i0hy1wvvtjyttxas
committer: v.ladeuil+lp at free.fr
branch nick: solaris.passes.test.suite
timestamp: Fri 2007-09-14 16:00:20 +0200
message:
merge fix for #59150 to be able to test without paramiko
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
-------------- next part --------------
=== modified file 'bzrlib/transport/local.py'
--- a/bzrlib/transport/local.py 2007-08-22 01:41:24 +0000
+++ b/bzrlib/transport/local.py 2007-09-17 16:35:22 +0000
@@ -30,6 +30,7 @@
from bzrlib import (
atomicfile,
+ errors,
osutils,
urlutils,
symbol_versioning,
@@ -486,8 +487,15 @@
try:
path = self._abspath(relpath)
os.rmdir(path)
- except (IOError, OSError),e:
- self._translate_error(e, path)
+ except (IOError, OSError), e:
+ myerrno = getattr(e, 'errno', None)
+ if (sys.platform == 'sunos5'
+ and myerrno == errno.EEXIST):
+ # man rmdir(2) is clear: EEXIST The directory contains
+ # entries other than those for "." and "..".
+ raise errors.DirectoryNotEmpty(path, extra=e)
+ else:
+ self._translate_error(e, path)
def _can_roundtrip_unix_modebits(self):
if sys.platform == 'win32':
More information about the bazaar-commits
mailing list