← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/runtime_tools/src/inviso_autostart.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/runtime_tools/src/inviso_autostart.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
59
59
                case try_load_module(FileNames) of
60
60
                    ok ->
61
61
                        autostart_apply(M,F);
 
62
 
62
63
                    false ->                % No such module available
63
64
                        "inviso_autostart.config"
64
65
                end;
65
 
            {ok,{gettia_asc,asc_file}} ->   % Uggly hack to not have to change in GSN-CPS.
66
 
                case try_load_module(["/tmp/DPE_COMMONLOG/gettia_asc",
67
 
                                      "/tmp/DPE_COMMONLOG/gettia_overload"]) of
68
 
                    ok ->
69
 
                        autostart_apply(gettia_asc,asc_file);
70
 
                    false ->                % No such module available
71
 
                        false
72
 
                end;
73
66
            {ok,{M,F}} ->                   % Use M:F(node())
74
67
                autostart_apply(M,F);
75
68
            {ok,no_autostart} ->