From 75a13d9369f787a7a65713d5529f4966503514e2 Mon Sep 17 00:00:00 2001 From: Felix Satyaputra Date: Fri, 24 Jun 2016 20:08:53 +0400 Subject: [PATCH] Fix duplicate RPM scriptlet override (#825) --- src/sbt-test/rpm/scriptlets-override-rpm/build.sbt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt b/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt index 1c5731f9c..bbebce4c3 100644 --- a/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt +++ b/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt @@ -41,17 +41,11 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) => () } -<<<<<<< HEAD -def countSubstring( str:String, substr:String ) = substr.r.findAllMatchIn(str).length - -def isUnique(str:String, searchstr: String) = countSubstring(str, searchstr) == 1 -======= def countSubstring(str: String, substr: String): Int = substr.r.findAllMatchIn(str).length def isUnique(str: String, searchstr: String): Boolean = countSubstring(str, searchstr) == 1 ->>>>>>> 54fb9aa... Fix duplicate RPM scriptlet override (#825) TaskKey[Unit]("unique-scripts-in-spec-file") <<= (target, streams) map { (target, out) => val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")