commit python-oslo.privsep for openSUSE:Factory

Hello community, here is the log from the commit of package python-oslo.privsep for openSUSE:Factory checked in at 2016-12-03 18:27:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.privsep (Old) and /work/SRC/openSUSE:Factory/.python-oslo.privsep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.privsep" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.privsep/python-oslo.privsep.changes 2016-09-30 15:29:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.privsep.new/python-oslo.privsep.changes 2016-12-03 18:27:44.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 2 11:30:49 UTC 2016 - tbechtold@suse.com + +- Add 0001-Deal-with-CONF.config_dir-correctly.patch + +------------------------------------------------------------------- +Fri Oct 14 14:00:49 UTC 2016 - tbechtold@suse.com + +- switch to stable/newton tarball in _service + +------------------------------------------------------------------- New: ---- 0001-Deal-with-CONF.config_dir-correctly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.privsep.spec ++++++ --- /var/tmp/diff_new_pack.ZGE17M/_old 2016-12-03 18:27:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ZGE17M/_new 2016-12-03 18:27:45.000000000 +0100 @@ -25,6 +25,8 @@ Group: Development/Languages/Python Url: http://launchpad.net/oslo.privsep Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +# 0001-Deal-with-CONF.config_dir-correctly.patch -- https://review.openstack.org/#/c/405544/ +Patch1: 0001-Deal-with-CONF.config_dir-correctly.patch BuildRequires: openstack-macros BuildRequires: python-Babel >= 2.3.4 BuildRequires: python-Sphinx @@ -67,6 +69,7 @@ %prep %setup -q -n %{sname}-%{version} +%patch1 -p1 %build %py2_build ++++++ 0001-Deal-with-CONF.config_dir-correctly.patch ++++++

From 227ff32013e58dcb430e887b85e880aed1e148c7 Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Thu, 1 Dec 2016 10:34:51 -0700 Subject: [PATCH] Deal with CONF.config_dir correctly

When config_dir is set, we were seeing this error: execv() arg 2 must contain only strings We got this debug log: ['sudo', 'nova-rootwrap', ... , '--config-file', '/nova/nova.conf', '--config-dir', ['/etc/nova'], ...] (cherry picked from commit 1666d9153a3b064c95e9fcaa6c3d77b926517a9c) Change-Id: I2f89cc49cbb43820d70c0d56f945d88ddaf2e5c6 Closes-Bug: 1646555 --- oslo_privsep/priv_context.py | 3 ++- oslo_privsep/tests/test_priv_context.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/oslo_privsep/priv_context.py b/oslo_privsep/priv_context.py index 737f3b0..12cf8cd 100644 --- a/oslo_privsep/priv_context.py +++ b/oslo_privsep/priv_context.py @@ -158,7 +158,8 @@ class PrivContext(object): try: if cfg.CONF.config_dir is not None: - cmd.extend(['--config-dir', cfg.CONF.config_dir]) + for cfg_dir in cfg.CONF.config_dir: + cmd.extend(['--config-dir', cfg_dir]) except cfg.NoSuchOptError: pass diff --git a/oslo_privsep/tests/test_priv_context.py b/oslo_privsep/tests/test_priv_context.py index eaddb9f..535e48f 100644 --- a/oslo_privsep/tests/test_priv_context.py +++ b/oslo_privsep/tests/test_priv_context.py @@ -104,7 +104,7 @@ class PrivContextTest(testctx.TestContextTestCase): def test_helper_command_default_dirtoo(self): self.privsep_conf.config_file = ['/bar.conf', '/baz.conf'] - self.privsep_conf.config_dir = '/foo.d' + self.privsep_conf.config_dir = ['/foo.d'] cmd = testctx.context.helper_command('/tmp/sockpath') expected = [ 'sudo', 'privsep-helper', -- 2.10.2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ZGE17M/_old 2016-12-03 18:27:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ZGE17M/_new 2016-12-03 18:27:45.000000000 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/o...</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/newton/open...</param> <param name="output-name">python-oslo.privsep.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-requ...</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/newton/glob...</param> </service> <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> @@ -10,4 +10,5 @@ <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> + <service name="format_spec_file" mode="disabled"/> </services>