/mandos/trunk : revision 1239

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

Committer: Teddy Hogeborn
Date: 2021-02-04 17:59:45 UTC
Revision ID: teddy@recompile.se-20210204175945-8druo6d88ipc1z58

Fix issue with french translation

Initial white space was missing in both msgid and msgstr of the french
translation, leading to checking tools reporing an incomplete
translation. The string is a raw key id, and therefore did not need
translation, so this was never a user-visible issue.

* debian/po/fr.po: Add missing whitespace to the id and translation
for msgid " ${key_id}".

Show diffs side-by-side

added added

removed removed

mandos-ctl

#!/usr/bin/python3 -bbI

# -*- after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-

# Mandos Monitor - Control and monitor the Mandos server

# Mandos Control - Control or query the Mandos server

# This file is part of Mandos.

locale.setlocale(locale.LC_ALL, "")

version = "1.8.11"

version = "1.8.14"

def main():

726

with self.convert_exception(dbus.Error):

727

value = method(*args)

728

# DBussy returns values either as an empty list or as a

729

# tuple: (signature, value)

729

# list of one element with the return value

730

if value:

731

return self.type_filter(value[0])

732

738

739

def type_filter(self, value):

740

"""Convert the most bothersome types to Python types"""

741

# A D-Bus Variant value is represented as the Python type

742

# Tuple[dbussy.DBUS.Signature, Any]

741

743

if isinstance(value, tuple):

742

744

if (len(value) == 2

743

745

and isinstance(value[0],

2437

2439

busname = "se.recompile.Mandos"

2438

2440

client_interface = "se.recompile.Mandos.Client"

2439

2441

command.Approve().run(self.bus.clients, self.bus)

2442

self.assertTrue(self.bus.clients)

2440

2443

for clientpath in self.bus.clients:

2441

2444

self.assertIn(("Approve", busname, clientpath,

2442

2445

client_interface, (True,)), self.bus.calls)

2445

2448

busname = "se.recompile.Mandos"

2446

2449

client_interface = "se.recompile.Mandos.Client"

2447

2450

command.Deny().run(self.bus.clients, self.bus)

2451

self.assertTrue(self.bus.clients)

2448

2452

for clientpath in self.bus.clients:

2449

2453

self.assertIn(("Approve", busname, clientpath,

2450

2454

client_interface, (False,)),

2451

2455

self.bus.calls)

2452

2456

2453

2457

def test_Remove(self):

2458

busname = "se.recompile.Mandos"

2459

server_path = "/"

2460

server_interface = "se.recompile.Mandos"

2461

orig_clients = self.bus.clients.copy()

2454

2462

command.Remove().run(self.bus.clients, self.bus)

2455

for clientpath in self.bus.clients:

2456

self.assertIn(("RemoveClient", dbus_busname,

2457

dbus_server_path, dbus_server_interface,

2463

self.assertFalse(self.bus.clients)

2464

for clientpath in orig_clients:

2465

self.assertIn(("RemoveClient", busname,

2466

server_path, server_interface,

2458

2467

(clientpath,)), self.bus.calls)

2459

2468

2460

2469

expected_json = {

2662

2671

else:

2663

2672

cmd_args = [() for x in range(len(self.values_to_get))]

2664

2673

values_to_get = self.values_to_get

2674

self.assertTrue(values_to_get)

2665

2675

for value_to_get, cmd_arg in zip(values_to_get, cmd_args):

2666

2676

for clientpath in self.bus.clients:

2667

2677

self.bus.clients[clientpath][self.propname] = (

2668

2678

Unique())

2669

2679

self.command(*cmd_arg).run(self.bus.clients, self.bus)

2680

self.assertTrue(self.bus.clients)

2670

2681

for clientpath in self.bus.clients:

2671

2682

value = (self.bus.clients[clientpath]

2672

2683

[self.propname])

Older »