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

« back to all changes in this revision

Viewing changes to lib/docbuilder/src/docb_xmerl_tree_cb.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:
188
188
    merge_attrs(Tag, default_attrs(DTD, Tag), GivenAttrs).
189
189
 
190
190
merge_attrs(Tag, [{NameA, Type, DefVal}|Default], GivenAttrs) ->
191
 
    Val = case lists:keysearch(NameA, #xmlAttribute.name, GivenAttrs) of
192
 
              {value, #xmlAttribute{value=Val0}} -> Val0;
 
191
    Val = case lists:keyfind(NameA, #xmlAttribute.name, GivenAttrs) of
 
192
              #xmlAttribute{value=Val0} -> Val0;
193
193
              false -> DefVal
194
194
          end,
195
195
    Attr = {attr_name(NameA), Type, attr_val(Type, Val)},