From 07dfd33c6f440c1b87b6aa4ea15046980a7803e3 Mon Sep 17 00:00:00 2001 From: Myyk Seok Date: Mon, 16 Mar 2015 19:50:25 -0700 Subject: [PATCH 1/2] Codacy recommended cleanup. --- src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala | 3 +-- .../scala/com/typesafe/sbt/packager/windows/WixHelper.scala | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala b/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala index 441245937..821efb20a 100644 --- a/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala +++ b/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala @@ -18,8 +18,7 @@ case class RpmMetadata( summary: String, description: String, autoprov: String, - autoreq: String) { -} + autoreq: String) /** * The Description used to generate an RPM diff --git a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala index c31bf8599..0a935e3cb 100644 --- a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala +++ b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala @@ -54,7 +54,7 @@ object WixHelper { // TODO - First we find directories... // Adds all subdirectories... there was a bug when there were directories with only subdirs and no files in the tree, // so there was a gap and dirXml failed to create some directories - def allParentDirs(f: File): Seq[File] = if (f == null) Seq() else Seq(f) ++ allParentDirs(f.getParentFile) + def allParentDirs(f: File): Seq[File] = Option(f).toSeq ++ allParentDirs(f.getParentFile) val filenamesPrep = for { f <- features From 75eb2ac957d9339a0ffaedd422e68cc2a020af61 Mon Sep 17 00:00:00 2001 From: Myyk Seok Date: Tue, 17 Mar 2015 10:54:49 -0700 Subject: [PATCH 2/2] Fix bug in PR-524. --- .../scala/com/typesafe/sbt/packager/windows/WixHelper.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala index 0a935e3cb..89f29ea1c 100644 --- a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala +++ b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala @@ -54,7 +54,7 @@ object WixHelper { // TODO - First we find directories... // Adds all subdirectories... there was a bug when there were directories with only subdirs and no files in the tree, // so there was a gap and dirXml failed to create some directories - def allParentDirs(f: File): Seq[File] = Option(f).toSeq ++ allParentDirs(f.getParentFile) + def allParentDirs(f: File): Seq[File] = Option(f).toSeq.flatMap(f => f +: allParentDirs(f.getParentFile)) val filenamesPrep = for { f <- features