/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/splashy.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/splashy.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 "splashy">
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
 
      <year>2011</year>
38
36
      <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
37
      <holder>Teddy Hogeborn</holder>
47
38
      <holder>Björn Påhlsson</holder>
48
39
    </copyright>
135
126
        <para>
136
127
          These variables will normally be inherited from
137
128
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
138
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
139
 
          have in turn inherited them from its calling process.
 
129
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
 
130
          normally have inherited them from
 
131
          <filename>/scripts/local-top/cryptroot</filename> in the
 
132
          initial <acronym>RAM</acronym> disk environment, which will
 
133
          have set them from parsing kernel arguments and
 
134
          <filename>/conf/conf.d/cryptroot</filename> (also in the
 
135
          initial RAM disk environment), which in turn will have been
 
136
          created when the initial RAM disk image was created by
 
137
          <filename
 
138
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
 
139
          extracting the information of the root file system from
 
140
          <filename >/etc/crypttab</filename>.
140
141
        </para>
141
142
        <para>
142
143
          This behavior is meant to exactly mirror the behavior of
202
203
      is ugly, but necessary as long as it does not support aborting a
203
204
      password request.
204
205
    </para>
205
 
    <xi:include href="../bugs.xml"/>
206
206
  </refsect1>
207
207
  
208
208
  <refsect1 id="example">
266
266
    <para>
267
267
      <citerefentry><refentrytitle>intro</refentrytitle>
268
268
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
269
      <citerefentry><refentrytitle>crypttab</refentrytitle>
 
270
      <manvolnum>5</manvolnum></citerefentry>,
269
271
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>
270
272
      <manvolnum>8mandos</manvolnum></citerefentry>,
271
273
      <citerefentry><refentrytitle>proc</refentrytitle>