/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/fakenfs.py

Merge bzr.dev and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/fakenfs.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 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
24
24
 
25
25
from stat import S_ISDIR
26
26
 
27
 
import bzrlib.errors as errors
 
27
from bzrlib import (
 
28
    errors,
 
29
    urlutils,
 
30
    )
28
31
from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
29
32
 
30
33
 
53
56
            else:
54
57
                raise
55
58
 
 
59
    def delete(self, relpath):
 
60
        if urlutils.basename(relpath).startswith('.nfs'):
 
61
            raise errors.ResourceBusy(self.abspath(relpath))
 
62
        return self._decorated.delete(relpath)
 
63
 
56
64
 
57
65
class FakeNFSServer(DecoratorServer):
58
66
    """Server for the FakeNFSTransportDecorator for testing with."""