Index: trunk/ippTools/share/receivetool_pendingfile.sql
===================================================================
--- trunk/ippTools/share/receivetool_pendingfile.sql	(revision 24787)
+++ trunk/ippTools/share/receivetool_pendingfile.sql	(revision 24788)
@@ -18,5 +18,6 @@
     ON receiveResult.file_id = receiveFile.file_id
 WHERE
-    ((receiveFileset.state = 'new') OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dirinfo'))
+    ((receiveFileset.state = 'new')
+    OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dirinfo' AND receiveFileset.dirinfo IS NULL))
     AND receiveFileset.fault = 0
     AND receiveResult.file_id IS NULL
Index: trunk/ippTools/share/receivetool_pendingfileset.sql
===================================================================
--- trunk/ippTools/share/receivetool_pendingfileset.sql	(revision 24787)
+++ trunk/ippTools/share/receivetool_pendingfileset.sql	(revision 24788)
@@ -1,4 +1,7 @@
 SELECT *
 FROM receiveFileset
-WHERE state = 'reg'
-    AND fault = 0
+JOIN receiveSource USING(source_id)
+LEFT JOIN receiveFile USING(fileset_id)
+WHERE receiveFileset.state = 'reg'
+    AND receiveFileset.fault = 0
+    AND receiveFile.fileset_id IS NULL