← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/quick-reference/Makefile

  • 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:
doc/en/quick-reference/Makefile
 
1
TARGETS=quick-start-summary.png quick-start-summary.pdf
 
2
OBJECTS=quick-start-summary.svg Makefile
 
3
 
 
4
all: $(TARGETS)
 
5
 
 
6
.SUFFIXES: .svg .png .pdf
 
7
 
 
8
.svg.pdf:
 
9
        rsvg-convert -d 300 -p 300 -f pdf -o $@ $<
 
10
 
 
11
.svg.png:
 
12
        rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
 
13
 
 
14
bzr-quickref.png: $(OBJECTS)
 
15
 
 
16
bzr-quickref.pdf: $(OBJECTS)
 
17
 
 
18
clean:
 
19
        rm -f $(TARGETS)