From 847c28abcfe508c7b63f5b9bc78cbc8962a2c8b7 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Thu, 2 Feb 2017 19:12:42 +0200 Subject: Avoid importing Linux specific modules on Windows oslo.rootwrap currently imports a few Linux-specific modules, which means that any services importing oslo.rootwrap modules will fail to start on Windows (e.g.: neutron-ovs-agent). Change-Id: I229c311939facdffdcde484f590e980102024b5a Closes-Bug: #1661326 --- oslo_rootwrap/filters.py | 7 ++++++- oslo_rootwrap/wrapper.py | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/oslo_rootwrap/filters.py b/oslo_rootwrap/filters.py index 1ae2cde..3c93d42 100644 --- a/oslo_rootwrap/filters.py +++ b/oslo_rootwrap/filters.py @@ -14,9 +14,14 @@ # under the License. import os -import pwd import re import shutil +import sys + +if sys.platform != 'win32': + # NOTE(claudiub): pwd is a Linux-specific library, and currently there is + # no Windows support for oslo.rootwrap. + import pwd def _getuid(user): diff --git a/oslo_rootwrap/wrapper.py b/oslo_rootwrap/wrapper.py index 998beae..49fdac3 100644 --- a/oslo_rootwrap/wrapper.py +++ b/oslo_rootwrap/wrapper.py @@ -16,8 +16,11 @@ import logging import logging.handlers import os -import pwd import signal +import sys + +if sys.platform != 'win32': + import pwd import six from six import moves -- cgit v1.2.1