/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/rules

  • Committer: Teddy Hogeborn
  • Date: 2016-03-12 20:23:15 UTC
  • Revision ID: teddy@recompile.se-20160312202315-hu7b87ivetlxqbw3
Server: Fix minor thing with Python 3 compatibility

Fix another small thing with unpickling string values.

* mandos (main): When restoring pickled client data, only decode byte
                 string for "host" key if it really is a byte string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
19
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
20
20
                install-client-nokey
21
21
 
22
 
override_dh_fixperms:
 
22
override_dh_fixperms-arch:
23
23
        dh_fixperms --exclude etc/keys/mandos \
24
 
                --exclude etc/mandos/clients.conf \
25
24
                --exclude etc/mandos/plugins.d \
26
25
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
27
26
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
28
27
        chmod --recursive g-w -- \
29
28
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
30
29
 
 
30
override_dh_fixperms-indep:
 
31
        dh_fixperms --exclude etc/mandos/clients.conf
 
32
 
31
33
override_dh_auto_test-arch: ;