~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/repository.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
import os
21
21
import Queue
22
22
import sys
 
23
import tarfile
23
24
import tempfile
24
25
import threading
25
26
 
682
683
            temp.close()
683
684
 
684
685
    def _tarball_of_dir(self, dirname, compression, ofile):
685
 
        import tarfile
686
686
        filename = os.path.basename(ofile.name)
687
687
        tarball = tarfile.open(fileobj=ofile, name=filename,
688
688
            mode='w|' + compression)