From c7541d9f14d9a7f2fc007b168a24791da715dc05 Mon Sep 17 00:00:00 2001
From: eblade <blade.eric@gmail.com>
Date: Wed, 25 Feb 2009 23:17:36 -0500
Subject: [PATCH] return appropriate tuple from import_fpdb_file on file error

---
 pyfpdb/fpdb_import.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index aa40b218..980b1bae 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -190,7 +190,8 @@ class Importer:
             self.addImportDirectory(dir, True, self.addToDirList[dir][0], self.addToDirList[dir][1])
             
         for file in self.removeFromFileList:
-            del self.filelist[file]
+            if file in self.filelist:
+                del self.filelist[file]
         
         self.addToDirList = {}
         self.removeFromFileList = {}
@@ -243,8 +244,8 @@ class Importer:
             if os.path.exists(file):
                 inputFile = open(file, "rU")
             else:
-                self.removeFromFileList['file'] = True
-                return
+                self.removeFromFileList[file] = True
+                return (0, 0, 0, 1, 0)
             try:
                 loc = self.pos_in_file[file]
             except: