← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clean_tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-08-18 01:29:12 UTC
  • mfrom: (5377.3.1 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20100818012912-wwgerzeui5ldf5lh
(mbp) slightly better error handling in ftp transport (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/clean_tree.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
import errno
19
18
import os
20
19
import shutil
21
20
 
22
 
from bzrlib import (
23
 
    bzrdir,
24
 
    errors,
25
 
    ui,
26
 
    )
 
21
from bzrlib import bzrdir, errors
27
22
from bzrlib.osutils import isdir
28
23
from bzrlib.trace import note
29
24
from bzrlib.workingtree import WorkingTree
98
93
 
99
94
def delete_items(deletables, dry_run=False):
100
95
    """Delete files in the deletables iterable"""
101
 
    def onerror(function, path, excinfo):
102
 
        """Show warning for errors seen by rmtree.
103
 
        """
104
 
        # Handle only permission error while removing files.
105
 
        # Other errors are re-raised.
106
 
        if function is not os.remove or excinfo[1].errno != errno.EACCES:
107
 
            raise
108
 
        ui.ui_factory.show_warning('unable to remove %s' % path)
109
96
    has_deleted = False
110
97
    for path, subp in deletables:
111
98
        if not has_deleted:
112
99
            note("deleting paths:")
113
100
            has_deleted = True
 
101
        note('  ' + subp)
114
102
        if not dry_run:
115
103
            if isdir(path):
116
 
                shutil.rmtree(path, onerror=onerror)
 
104
                shutil.rmtree(path)
117
105
            else:
118
 
                try:
119
 
                    os.unlink(path)
120
 
                    note('  ' + subp)
121
 
                except OSError, e:
122
 
                    # We handle only permission error here
123
 
                    if e.errno != errno.EACCES:
124
 
                        raise e
125
 
                    ui.ui_factory.show_warning(
126
 
                        'unable to remove "%s": %s.' % (path, e.strerror))
127
 
        else:
128
 
            note('  ' + subp)
 
106
                os.unlink(path)
129
107
    if not has_deleted:
130
108
        note("No files deleted.")