[Pkg-erlang-commits] r1495 - in erlang/branches/experimental/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-03-21 10:38:18 +0000 (Thu, 21 Mar 2013)
New Revision: 1495

Added:
   erlang/branches/experimental/debian/patches/dialyzer.patch
Modified:
   erlang/branches/experimental/debian/changelog
   erlang/branches/experimental/debian/patches/series
Log:
[erlang-experimental]
  * Added patch by Maxim Treskin which fixes dialyzer error "duplicates
    modules".


Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog	2013-03-20 09:51:02 UTC (rev 1494)
+++ erlang/branches/experimental/debian/changelog	2013-03-21 10:38:18 UTC (rev 1495)
@@ -1,8 +1,9 @@
-erlang (1:16.b-dfsg-2) UNRELEASED; urgency=low
+erlang (1:16.b-dfsg-2) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Added patch by Maxim Treskin which fixes dialyzer error "duplicates
+    modules".
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 01 Mar 2013 10:05:18 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 21 Mar 2013 14:37:46 +0400
 
 erlang (1:16.b-dfsg-1) experimental; urgency=low
 

Added: erlang/branches/experimental/debian/patches/dialyzer.patch
===================================================================
--- erlang/branches/experimental/debian/patches/dialyzer.patch	                        (rev 0)
+++ erlang/branches/experimental/debian/patches/dialyzer.patch	2013-03-21 10:38:18 UTC (rev 1495)
@@ -0,0 +1,29 @@
+Author: Maxim Treskin <zerthurd at gmail.com>
+Description: Patch fixes incorrect "duplicated modules" error.
+Last-updated: Thu, 21 Mar 2013 14:12:18 +0400
+
+--- erlang-16.b-dfsg.orig/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
++++ erlang-16.b-dfsg/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+@@ -255,10 +255,18 @@
+   CServer2 = dialyzer_codeserver:set_next_core_label(NextLabel, CServer),
+   case Failed =:= [] of
+     true ->
+-      NewFiles = lists:zip(lists:reverse(Modules), Files),
++      %% Modules and Files have not the same order, so it is meaningless to zip it
++      %% NewFiles = lists:zip(lists:reverse(Modules), Files),
++
+       ModDict =
+-        lists:foldl(fun({Mod, F}, Dict) -> dict:append(Mod, F, Dict) end,
+-                    dict:new(), NewFiles),
++        lists:foldl(fun(F, Dict) ->
++                        ModFile = lists:last(filename:split(F)),
++                        Mod = filename:basename(ModFile, ".beam"),
++                        dict:append(Mod, F, Dict) end,
++                    dict:new(), Files),
++      %% ModDict =
++      %%   lists:foldl(fun({Mod, F}, Dict) -> dict:append(Mod, F, Dict) end,
++      %%               dict:new(), NewFiles),
+       check_for_duplicate_modules(ModDict);
+     false ->
+       Msg = io_lib:format("Could not scan the following file(s): ~p",
+

Modified: erlang/branches/experimental/debian/patches/series
===================================================================
--- erlang/branches/experimental/debian/patches/series	2013-03-20 09:51:02 UTC (rev 1494)
+++ erlang/branches/experimental/debian/patches/series	2013-03-21 10:38:18 UTC (rev 1495)
@@ -8,3 +8,4 @@
 java.patch
 hppa.patch
 powerpc.patch
+dialyzer.patch