← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clean_tree.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 08:34:03 UTC
  • mfrom: (6191.2.1 843900-url-nameerror)
  • Revision ID: pqm@pqm.ubuntu.com-20111006083403-jnsw0exlirg01aed
(mbp) error message without traceback on invalid ubuntu/debian url (bug
 843900) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/clean_tree.py
20
20
import shutil
21
21
 
22
22
from bzrlib import (
23
 
    controldir,
 
23
    bzrdir,
24
24
    errors,
25
25
    ui,
26
26
    )
85
85
        # directory and therefore delete it. (worth to FIXME?)
86
86
        if isdir(path):
87
87
            try:
88
 
                controldir.ControlDir.open(path)
 
88
                bzrdir.BzrDir.open(path)
89
89
            except errors.NotBranchError:
90
90
                result.append((path,subp))
91
91
            else: