← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to contrib/debian/default

  • Committer: Vincent Ladeuil
  • Date: 2008-01-29 15:16:31 UTC
  • mto: (3206.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3207.
  • Revision ID: v.ladeuil+lp@free.fr-20080129151631-vqjd13tb405mobx6
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.

* bzrlib/tests/test_transform.py:
(TestTransformMerge): Revert previous patch and cleanly call
preview.finalize now that we can.

* bzrlib/tests/test_merge.py:
(TestMerge.test_make_preview_transform): Catch TransformPreview
leak.

* bzrlib/builtins.py:
(cmd_merge._do_preview): Finalize the TransformPreview or the
limbodir will stay in /tmp.

* bzrlib/transform.py:
(TreeTransformBase.__init__): Create the _deletiondir since it's
reffered to by finalize.
(TreeTransformBase.finalize): Delete the dir only if _deletiondir
is set.
(TreeTransform.__init__): Use a temp var for deletiondir and set
the attribute after the base class __init__ has been called.
(TransformPreview.__init__): Read locks the tree since finalize
wants to unlock it (as suggested by Aaron).

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/debian/default
1
 
# Specify startup options for bzr --serve
2
 
 
3
 
# WARNING
4
 
# When bazaar runs in serve mode there is no authentication. You will
5
 
# be publishing your tree as readable or potentially writeable to everyone
6
 
 
7
 
# You need to uncomment the line below to enable this service
8
 
#ENABLED=1
9
 
 
10
 
# Specify a user and group to run as
11
 
#USER=bzr
12
 
#GROUP=bzr
13
 
 
14
 
# Specify the path to the repository
15
 
#REPO=/srv/bzr
16
 
 
17
 
# Other arguments
18
 
# Add --allow-writes for RW access
19
 
# Example config listens on localhost
20
 
DAEMON_ARGS="--port=127.0.0.1:4155"