From eb31cc025a3728877a69e3e451f9f21489910df0 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 25 Jul 2011 21:38:01 -0400 Subject: [PATCH] Allow multiple sources to target a target directory in sync.noDuplicateTargets. fixes #125 --- main/actions/Sync.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/actions/Sync.scala b/main/actions/Sync.scala index 072c7054c..39a9cb34e 100644 --- a/main/actions/Sync.scala +++ b/main/actions/Sync.scala @@ -58,14 +58,14 @@ object Sync def noDuplicateTargets(relation: Relation[File, File]) { - val dups = relation.reverseMap.collect { - case (target, srcs) if srcs.size >= 2 => - "\n\t" + target + "\nfrom\n\t" + srcs.mkString("\n\t") + val dups = relation.reverseMap.filter { case (target, srcs) => + srcs.size >= 2 && srcs.forall(_.isDirectory) + } map { case (target, srcs) => + "\n\t" + target + "\nfrom\n\t" + srcs.mkString("\n\t\t") } if(!dups.isEmpty) error("Duplicate mappings:" + dups.mkString) } - import java.io.{File, IOException} import sbinary._