Просмотр исходного кода

Don't patch plugin at all if not required

Remove riak_test from the index as it broke and the problem
is larger than it looks.
Loïc Hoguin 10 лет назад
Родитель
Сommit
54794fd9a0
4 измененных файлов с 7 добавлено и 7 удалено
  1. 7 4
      core/deps.mk
  2. 0 1
      packages.v1.tsv
  3. 0 1
      packages.v1.txt
  4. 0 1
      packages.v2.tsv

+ 7 - 4
core/deps.mk

@@ -367,10 +367,13 @@ define dep_autopatch_rebar.erl
 	Write("\ninclude ../../erlang.mk"),
 	PatchPlugin = fun(ErlFile) ->
 		{ok, F0} = file:read_file(ErlFile),
-		F = re:replace(F0, "rebar_config:", "rebar_config_", [global]),
-		ok = file:write_file(ErlFile, [F,
-			"\nrebar_config_get(_, current_command, _) -> compile.\n"
-		])
+		case re:replace(F0, "rebar_config:", "rebar_config_", [global]) of
+			F0 -> ok;
+			F ->
+				ok = file:write_file(ErlFile, [F,
+					"\nrebar_config_get(_, current_command, _) -> compile.\n"
+				])
+		end
 	end,
 	RunPlugin = fun(Plugin, Step) ->
 		case erlang:function_exported(Plugin, Step, 2) of

+ 0 - 1
packages.v1.tsv

@@ -307,7 +307,6 @@ riak_pg	https://github.com/cmeiklejohn/riak_pg	https://github.com/cmeiklejohn/ri
 riak_pipe	https://github.com/basho/riak_pipe	https://github.com/basho/riak_pipe	Riak Pipelines
 riakpool	https://github.com/dweldon/riakpool	https://github.com/dweldon/riakpool	erlang riak client pool
 riak_sysmon	https://github.com/basho/riak_sysmon	https://github.com/basho/riak_sysmon	Simple OTP app for managing Erlang VM system_monitor event messages
-riak_test	https://github.com/basho/riak_test	https://github.com/basho/riak_test	I'm in your cluster, testing your riaks
 rivus_cep	https://github.com/vascokk/rivus_cep	https://github.com/vascokk/rivus_cep	Complex event processing in Erlang
 rlimit	https://github.com/jlouis/rlimit	https://github.com/jlouis/rlimit	Magnus Klaar's rate limiter code from etorrent
 safetyvalve	https://github.com/jlouis/safetyvalve	https://github.com/jlouis/safetyvalve	A safety valve for your erlang node

+ 0 - 1
packages.v1.txt

@@ -307,7 +307,6 @@ riak_pg	https://github.com/cmeiklejohn/riak_pg	https://github.com/cmeiklejohn/ri
 riak_pipe	https://github.com/basho/riak_pipe	https://github.com/basho/riak_pipe	Riak Pipelines
 riakpool	https://github.com/dweldon/riakpool	https://github.com/dweldon/riakpool	erlang riak client pool
 riak_sysmon	https://github.com/basho/riak_sysmon	https://github.com/basho/riak_sysmon	Simple OTP app for managing Erlang VM system_monitor event messages
-riak_test	https://github.com/basho/riak_test	https://github.com/basho/riak_test	I'm in your cluster, testing your riaks
 rivus_cep	https://github.com/vascokk/rivus_cep	https://github.com/vascokk/rivus_cep	Complex event processing in Erlang
 rlimit	https://github.com/jlouis/rlimit	https://github.com/jlouis/rlimit	Magnus Klaar's rate limiter code from etorrent
 safetyvalve	https://github.com/jlouis/safetyvalve	https://github.com/jlouis/safetyvalve	A safety valve for your erlang node

+ 0 - 1
packages.v2.tsv

@@ -307,7 +307,6 @@ riak_pg	git	https://github.com/cmeiklejohn/riak_pg	master	https://github.com/cme
 riak_pipe	git	https://github.com/basho/riak_pipe	master	https://github.com/basho/riak_pipe	Riak Pipelines
 riakpool	git	https://github.com/dweldon/riakpool	master	https://github.com/dweldon/riakpool	erlang riak client pool
 riak_sysmon	git	https://github.com/basho/riak_sysmon	master	https://github.com/basho/riak_sysmon	Simple OTP app for managing Erlang VM system_monitor event messages
-riak_test	git	https://github.com/basho/riak_test	master	https://github.com/basho/riak_test	I'm in your cluster, testing your riaks
 rivus_cep	git	https://github.com/vascokk/rivus_cep	master	https://github.com/vascokk/rivus_cep	Complex event processing in Erlang
 rlimit	git	https://github.com/jlouis/rlimit	master	https://github.com/jlouis/rlimit	Magnus Klaar's rate limiter code from etorrent
 safetyvalve	git	https://github.com/jlouis/safetyvalve	master	https://github.com/jlouis/safetyvalve	A safety valve for your erlang node