From: westcott <westcott>
Date: Mon, 25 Oct 2010 13:59:04 +0000 (+0000)
Subject: testing 1.14.0
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=6a0001cc8c2f8de157f4979fd0d97a6e911b58e8

testing 1.14.0
---

diff --git a/mothur b/mothur
index a609d20..a29d1c9 100755
Binary files a/mothur and b/mothur differ
diff --git a/pipelinepdscommand.cpp b/pipelinepdscommand.cpp
index 691d35d..2bbf223 100644
--- a/pipelinepdscommand.cpp
+++ b/pipelinepdscommand.cpp
@@ -375,8 +375,11 @@ bool PipelineCommand::checkForValidAndRequiredParameters(string name, string opt
 				itMade = mothurMadeFiles.find(it->first);
 				
 				if (itMade == mothurMadeFiles.end()) {  
-					m->mothurOut("You have the " + it->first + " listed as a mothurmade file for the " + name + " command, but it seems mothur will not make that file in your current pipeline, please correct."); m->mothurOutEndLine();
-					return true;
+					if ((name == "align.seqs") && (it->first == "candidate")) {} //do nothing about candidate
+					else {
+						m->mothurOut("You have the " + it->first + " listed as a mothurmade file for the " + name + " command, but it seems mothur will not make that file in your current pipeline, please correct."); m->mothurOutEndLine();
+						return true;
+					}
 				}
 			}
 		}