Allow dyn_file_func to trigger a FileNotFound error.

Signed-off-by: Michael P. Soulier <msoulier@digitaltorque.ca>
master
Kenny Millington 2010-10-18 11:50:07 +01:00 committed by Michael P. Soulier
parent 4396124b8d
commit 71d827dd89
1 changed files with 6 additions and 0 deletions

View File

@ -593,6 +593,12 @@ class TftpStateServerRecvRRQ(TftpState):
log.debug("No such file %s but using dyn_file_func" % path)
self.context.fileobj = \
self.context.dyn_file_func(self.context.file_to_transfer)
if self.context.fileobj is None:
log.debug("dyn_file_func returned 'None', treating as "
"FileNotFound")
self.sendError(TftpErrors.FileNotFound)
raise TftpException, "File not found: %s" % path
else:
self.sendError(TftpErrors.FileNotFound)
raise TftpException, "File not found: %s" % path