/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/usplash.xml

  • Committer: Teddy Hogeborn
  • Date: 2014-07-25 23:16:04 UTC
  • mto: This revision was merged to the branch mainline in revision 724.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/usplash.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "usplash">
5
 
<!ENTITY TIMESTAMP "2019-02-10">
 
5
<!ENTITY TIMESTAMP "2012-01-01">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
 
      <year>2010</year>
37
36
      <year>2011</year>
38
37
      <year>2012</year>
39
 
      <year>2013</year>
40
 
      <year>2014</year>
41
 
      <year>2015</year>
42
 
      <year>2016</year>
43
 
      <year>2017</year>
44
 
      <year>2018</year>
45
 
      <year>2019</year>
46
38
      <holder>Teddy Hogeborn</holder>
47
39
      <holder>Björn Påhlsson</holder>
48
40
    </copyright>
135
127
        <para>
136
128
          These variables will normally be inherited from
137
129
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
138
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
139
 
          have in turn inherited them from its calling process.
 
130
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
 
131
          normally have inherited them from
 
132
          <filename>/scripts/local-top/cryptroot</filename> in the
 
133
          initial <acronym>RAM</acronym> disk environment, which will
 
134
          have set them from parsing kernel arguments and
 
135
          <filename>/conf/conf.d/cryptroot</filename> (also in the
 
136
          initial RAM disk environment), which in turn will have been
 
137
          created when the initial RAM disk image was created by
 
138
          <filename
 
139
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
 
140
          extracting the information of the root file system from
 
141
          <filename >/etc/crypttab</filename>.
140
142
        </para>
141
143
        <para>
142
144
          This behavior is meant to exactly mirror the behavior of
216
218
      is ugly, but necessary as long as it does not support aborting a
217
219
      password request.
218
220
    </para>
219
 
    <xi:include href="../bugs.xml"/>
220
221
  </refsect1>
221
222
  
222
223
  <refsect1 id="example">
280
281
    <para>
281
282
      <citerefentry><refentrytitle>intro</refentrytitle>
282
283
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
284
      <citerefentry><refentrytitle>crypttab</refentrytitle>
 
285
      <manvolnum>5</manvolnum></citerefentry>,
283
286
      <citerefentry><refentrytitle>fifo</refentrytitle>
284
287
      <manvolnum>7</manvolnum></citerefentry>,
285
288
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>