/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 debian/mandos.postinst

  • Committer: Teddy Hogeborn
  • Date: 2014-07-24 01:35:55 UTC
  • Revision ID: teddy@recompile.se-20140724013555-zrgds2ft5cmwhugb
Fix two mutually cancelling bugs.

* mandos (rfc3339_duration_to_delta): Set "token_duration" to be a
                                      token (and not a tuple) by
                                      removing the final comma.
                                      Construct the needed tuple later
                                      when initializing the
                                      "followers" variable.
* mandos-ctl (rfc3339_duration_to_delta): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
51
51
# "avahi-daemon") in its /etc/init.d script header.  To make
52
52
# insserv(8) happy, we edit our /etc/init.d script header to contain
53
53
# the correct string before the code added by dh_installinit calls
54
 
# update.rd-c, which calls insserv.
 
54
# update.rc-d, which calls insserv.
55
55
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
56
56
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
57
57
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos