[MERGE] [BUG 363837] My first attempt to send a bundle

Maritza Mendez martitzam at gmail.com
Thu Apr 30 22:09:36 BST 2009


# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martitza at rubuntu-20090430203954-tkvav8y7aalls1vw
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 476dbe571ca34e794481698953080b52f4c8afd2
# timestamp: 2009-04-30 14:05:50 -0700
# base_revision_id: pqm at pqm.ubuntu.com-20090430150023-1cw4lwqf312vpuu8
#
# Begin patch
=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py    2009-04-06 14:01:16 +0000
+++ bzrlib/osutils.py    2009-04-30 20:39:54 +0000
@@ -368,6 +368,12 @@

     MIN_ABS_PATHLENGTH = 3

+    def chance(function, path):
+        """Sleep and try (again) to perform function on path.
+        """
+        time.sleep(0.250)
+        function(path)
+
     def _win32_delete_readonly(function, path, excinfo):
         """Error handler for shutil.rmtree function [for win32]
         Helps to remove files and dirs marked as read-only.
@@ -377,9 +383,22 @@
             and isinstance(exception, OSError) \
             and exception.errno == errno.EACCES:
             make_writable(path)
-            function(path)
+            success = True
+            try:
+                function(path)
+            except:
+                success = False
+                chances = 1
+                while chances<3:
+                    try:
+                        chance(function, path)
+                        success = True
+                    except:
+                        chances = chances + 1
+            if not success:
+                raise errors.BzrError('unable to remove %s' %
path)
         else:
-            raise
+            raise errors.BzrError('internal error in
_win32_delete_readonly')

     def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
         """Replacer for shutil.rmtree: could remove readonly dirs/files"""

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa5JqcwAAev/gERURABT7///
UwIMAL////BQBFql7pGY5Rm0LCSQgmm1TNGkxqYNU8KeJqaabUMj1NM1NBJRDSZkaAUD1BoAAAAA
AxJpE9TCNT0jT1HqGjQaAaAaDQA5gAJkwAJhMEwhgCMACSRqaACm01MmUaeRqeptQPSAB5QbUnJD
W5eETyx6vsXnLmjYtwUaREwZi9JcI0rhffg4IvSjpX6bZMKEgluMJMyLKfj4m9qjyiwzL+W+nFjB
7zYQ6bZQOh4blREvFCn51QtfWxGu3J8+/27rDJ4dnUn5S6lxuKdzjTjhGmSy3y15cDZHxc0s/AbI
KGfI+DINh1bPHxKjRJWNYbY+xUxBpNTy1f2JT8lfFgsV3vFY514rJjLY/XLUGwNjrb0uQFFPpgBS
Gy+9C5syKIM4ykCY55lMKjJCmTTi2EaEyDi5QcNRt4QLxYWQKmsqjXTnCBhwli9IDL3FI9PHK7QZ
k55K8zFk6yZCeLCYgsS0sk8QnoxKRh0RyME6CdYrP8PMX2GRkrWKzrrE7vqxKDAyLzrKqpC0wrZw
kQK2JDoK78DHS8Zmr8iGFSgpzKZsSseKkaXGiJCUtkbqVDriNI0xWIOTk2saSphsieVkSfcbRJBj
SN0hA6WsqdQaRU0MjawsQmVSxICqHNVS5Ldrlmka6xmOKeYHEMgEVOMGkWqlEdyGQje0YpCGdXPx
MIIX6hXVCLCZNDDzHOTXEpL25Q1YxySQtsqEkiFVz4oifwru4IQnCsmSrBxQkSK3OzGfczjFJ67z
qD+sVezXaLk5jmFPjLAXPUlgyiLtFTvuoN53mw3DjjX+fwEeOUdgpKgkGRvIdCIcAa/lpOUIVPvU
ZI7OCaFpcxhHp6adF/w6dYkZsxyh6Ytjad7zM617spig88M0g7je5TG8uZdrXYA/McS9vnJndjXu
ZA3QgajkPg3Fu1MigqJs1+vRDvUQkHcMHWsKSsDnzqTytpbSdFrIh9BjUSFhjHDwnOPnXwbU2Flt
9+D+XTmRS98iMzNoBhYH0fu+h97Q1X0RA06Dv30hIlWVRPIOzpXlfNXcQyUaDcBrkAkrh2m6sJRT
6NeyhaYGxls6yOz3AO6/1nLAvmao8GDScQP13jxKiaBQIXwF0sc3GIhyEiggbJXiYmBCiBPM2lpn
dFIiYEMc9xleA4nRIv7ZhTsThAIHuiGbM2V2bRgQhcT5862uzKQ1AWY8FGcooGpLVqW1W3RU2MsW
O4mHh8+E+zundWUCv7X1Mo2krbQjqe8NaH5DEhiwCEDQl5FLjDDm9N5UnagdyQzQI4lWpXEQGkuy
hKYNGn75Peq2xPrc5t4nV0hdhNYUUChXibVHxY3ocD1CirgqJmI4/KJOy0sIgQAuEVqKWhVB4ROr
u4sjcIkGlZcQpvEXbfTwJ+a8xcCVgxrTk1ZlQRZYTHVIw/0Ei6iwAmuF72fAX+LuSKcKEhXJNTmA
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090430/3e7b204d/attachment-0001.htm 


More information about the bazaar mailing list