/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 at recompile
  • Date: 2020-01-12 01:53:04 UTC
  • Revision ID: teddy@recompile.se-20200112015304-gqif9w4pbyix8w6b
mandos-ctl: Fix minor bug in tests

Fix two tests, the last assert of which would always erroneously
succeed.  (No change in non-test code needed.)

* mandos-ctl (Test_dbus_python_adapter_SystemBus): In the
  test_call_method_handles_exception() method, fix check for
  dbus.ConnectFailed exception.
  (Test_pydbus_adapter_SystemBus): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
43
43
        dh_fixperms --exclude etc/mandos/clients.conf
44
44
 
45
45
override_dh_auto_test-arch: ;
 
46
 
 
47
#bpo## dpkg-shlibdeps sees the "libgnutls28-dev (>= 3.6.6) |
 
48
#bpo## libgnutls28-dev (<< 3.6.0)," in the build-dependencies not as two
 
49
#bpo## alternatives, but as an absolute dependency on libgnutls30 >= 3.6.6.
 
50
#bpo## So we have to do this ugly hack to hide this build dependency if we
 
51
#bpo## compiled with libgnutls30 << 3.6.0.
 
52
#bpo#override_dh_shlibdeps-arch:
 
53
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
 
54
#bpo#           --show libgnutls30); \
 
55
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
 
56
#bpo#           && { cp --archive debian/control debian/control.orig; sed --in-place --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
 
57
#bpo#   dh_shlibdeps
 
58
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
 
59
#bpo#           --show libgnutls30); \
 
60
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
 
61
#bpo#           && mv debian/control.orig debian/control