From 1c5842fa302bbc5d8570b67215459f315db5792c Mon Sep 17 00:00:00 2001 From: Zhao Lei Date: Thu, 24 Sep 2015 17:53:40 +0800 Subject: [PATCH] Fix some spelling typo in manual explicitely -> explicitly priviledges -> privileges for README.rst Plus some source comment fix. Change-Id: Ibbe08d01e0cd380604fbd43786c8adb0ac9765f1 Signed-off-by: Zhao Lei --- README.rst | 4 ++-- oslo_rootwrap/client.py | 2 +- oslo_rootwrap/jsonrpc.py | 2 +- oslo_rootwrap/tests/test_functional.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 6d1f525..6c80e90 100644 --- a/README.rst +++ b/README.rst @@ -102,7 +102,7 @@ filters_path exec_dirs Comma-separated list of directories to search executables in, in case - filters do not explicitely specify a full path. If not specified, defaults + filters do not explicitly specify a full path. If not specified, defaults to the system `PATH` environment variable. All directories listed must be owned and only writeable by `root`. Example: ``exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin`` @@ -325,7 +325,7 @@ Daemon mode Since 1.3.0 version ``oslo.rootwrap`` supports "daemon mode". In this mode rootwrap would start, read config file and wait for commands to be run with -root priviledges. All communications with the daemon should go through +root privileges. All communications with the daemon should go through ``Client`` class that resides in ``oslo_rootwrap.client`` module. Its constructor expects one argument - a list that can be passed to ``Popen`` diff --git a/oslo_rootwrap/client.py b/oslo_rootwrap/client.py index 0c3a500..6f7fd37 100644 --- a/oslo_rootwrap/client.py +++ b/oslo_rootwrap/client.py @@ -38,7 +38,7 @@ if patched_socket: # GreenSocket.recv_into: # https://bitbucket.org/eventlet/eventlet/pull-request/41 # This check happens here instead of jsonrpc to avoid importing eventlet - # from daemon code that is run with root priviledges. + # from daemon code that is run with root privileges. jsonrpc.JsonConnection.recvall = jsonrpc.JsonConnection._recvall_slow try: diff --git a/oslo_rootwrap/jsonrpc.py b/oslo_rootwrap/jsonrpc.py index 37a642f..c88b747 100644 --- a/oslo_rootwrap/jsonrpc.py +++ b/oslo_rootwrap/jsonrpc.py @@ -146,7 +146,7 @@ class JsonConnection(object): def half_close(self): self._socket.shutdown(socket.SHUT_RD) - # Unfortunatelly Python 2.6 doesn't support memoryview, so we'll have + # Unfortunately Python 2.6 doesn't support memoryview, so we'll have # to do it the slow way. def _recvall_slow(self, size): remaining = size diff --git a/oslo_rootwrap/tests/test_functional.py b/oslo_rootwrap/tests/test_functional.py index 73172aa..e062b7c 100644 --- a/oslo_rootwrap/tests/test_functional.py +++ b/oslo_rootwrap/tests/test_functional.py @@ -173,7 +173,7 @@ class RootwrapDaemonTest(_FunctionalBase, testtools.TestCase): self.execute(['cat']) # Make daemon go away os.kill(self.client._process.pid, signal.SIGTERM) - # Expect client to succesfully restart daemon and run simple request + # Expect client to successfully restart daemon and run simple request self.test_run_once() def _exec_thread(self, fifo_path):