← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/treeshape.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-14 17:02:35 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051114170235-f85afa458bae956e
Fixing up the error message for a failed bind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/treeshape.py
31
31
import stat
32
32
 
33
33
from bzrlib.trace import warning
34
 
from bzrlib.osutils import pathjoin
35
34
 
36
35
def build_tree_contents(template):
37
36
    """Reconstitute some files from a text description.
64
63
        yield (dirpath + '/', )
65
64
        filenames.sort()
66
65
        for fn in filenames:
67
 
            fullpath = pathjoin(dirpath, fn)
68
 
            assert not (fullpath[-1] in '@/')
 
66
            fullpath = os.path.join(dirpath, fn)
 
67
            self.assertFalse(fullpath[-1] in '@/')
69
68
            info = os.lstat(fullpath)
70
69
            if stat.S_ISLNK(info.st_mode):
71
70
                yield (fullpath + '@', os.readlink(fullpath))