Hello community,
here is the log from the commit of package python-oslo.rootwrap for
openSUSE:Factory checked in at 2018-09-07 15:39:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.rootwrap (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.rootwrap"
Fri Sep 7 15:39:06 2018 rev:8 rq:633107 version:5.14.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.rootwrap/python-oslo.rootwrap.changes
2018-03-19 23:36:21.653719744 +0100
+++
/work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new/python-oslo.rootwrap.changes
2018-09-07 15:39:07.214554406 +0200
@@ -1,0 +2,16 @@
+Mon Sep 3 09:25:20 UTC 2018 - cloud-de...@suse.de
+
+- update to version 5.14.1
+ - Treat doc warnings as errors
+ - Remove stale pip-missing-reqs tox test
+ - set default python to python3
+ - Update to support running benchmark on python3
+ - Update reno for stable/queens
+ - Update links in README
+ - Trivial: Update pypi url to new url
+ - fix lower constraints and uncap eventlet
+ - Updated from global requirements
+ - add lower-constraints job
+ - Make IpNetnsExecFilter more strict to detect aliases
+
+-------------------------------------------------------------------
Old:
----
oslo.rootwrap-5.13.0.tar.gz
New:
----
oslo.rootwrap-5.14.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.rootwrap.spec ++++++
--- /var/tmp/diff_new_pack.2a9XNV/_old 2018-09-07 15:39:07.566554028 +0200
+++ /var/tmp/diff_new_pack.2a9XNV/_new 2018-09-07 15:39:07.570554024 +0200
@@ -17,25 +17,35 @@
Name: python-oslo.rootwrap
-Version: 5.13.0
+Version: 5.14.1
Release: 0
Summary: Filtering shell commands to run as root from OpenStack services
License: Apache-2.0
Group: Development/Languages/Python
-Url: https://launchpad.net/oslo.rootwrap
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.rootwrap/oslo.rootwrap-5.13.0.tar.gz
+URL: https://launchpad.net/oslo.rootwrap
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.rootwrap/oslo.rootwrap-5.14.1.tar.gz
BuildRequires: openstack-macros
BuildRequires: python-devel
-BuildRequires: python-eventlet >= 0.18.2
-BuildRequires: python-fixtures >= 3.0.0
-BuildRequires: python-mock >= 2.0.0
-BuildRequires: python-oslotest >= 3.2.0
-BuildRequires: python-pbr >= 2.0.0
-BuildRequires: python-python-subunit >= 1.0.0
-BuildRequires: python-six >= 1.10.0
-BuildRequires: python-testrepository >= 0.0.18
-BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 2.2.0
+BuildRequires: python2-eventlet
+BuildRequires: python2-fixtures
+BuildRequires: python2-mock
+BuildRequires: python2-oslotest
+BuildRequires: python2-pbr
+BuildRequires: python2-python-subunit
+BuildRequires: python2-six >= 1.10.0
+BuildRequires: python2-testrepository
+BuildRequires: python2-testscenarios
+BuildRequires: python2-testtools
+BuildRequires: python3-eventlet
+BuildRequires: python3-fixtures
+BuildRequires: python3-mock
+BuildRequires: python3-oslotest
+BuildRequires: python3-pbr
+BuildRequires: python3-python-subunit
+BuildRequires: python3-six >= 1.10.0
+BuildRequires: python3-testrepository
+BuildRequires: python3-testscenarios
+BuildRequires: python3-testtools
Requires: python-six >= 1.10.0
BuildArch: noarch
%if 0%{?suse_version}
@@ -43,49 +53,72 @@
%else
BuildRequires: iproute
%endif
+%if 0%{?suse_version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%else
+# on RDO, update-alternatives is in chkconfig
+Requires(post): chkconfig
+Requires(postun): chkconfig
+%endif
+%python_subpackages
%description
oslo.rootwrap allows fine-grained filtering of shell commands to run as root
from OpenStack services.
-%package doc
+%package -n python-oslo.rootwrap-doc
Summary: Documentation for OpenStack oslo.rootwrap
Group: Development/Languages/Python
BuildRequires: python-Sphinx
-BuildRequires: python-openstackdocstheme >= 1.18.1
-BuildRequires: python-reno >= 2.5.0
+BuildRequires: python-openstackdocstheme
-%description doc
+%description -n python-oslo.rootwrap-doc
Documentation for the OpenStack oslo.rootwrap library.
%prep
-%autosetup -p1 -n oslo.rootwrap-5.13.0
+%autosetup -p1 -n oslo.rootwrap-5.14.1
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
-%{py2_build}
+%{python_build}
# generate html docs
-%{__python2} setup.py build_sphinx
+PBR_VERSION=5.14.1 sphinx-build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%{py2_install}
+%{python_install}
+%python_clone -a %{buildroot}%{_bindir}/oslo-rootwrap
+%python_clone -a %{buildroot}%{_bindir}/oslo-rootwrap-daemon
+
+%post
+%python_install_alternative oslo-rootwrap
+%python_install_alternative oslo-rootwrap-daemon
+
+%postun
+%python_uninstall_alternative oslo-rootwrap
+%python_uninstall_alternative oslo-daemon
%check
export PYTHONPATH=.
-%{__python2} setup.py testr
+PYTHON=python2 %{__python2} setup.py testr
+# FIXME(ykarel) Remove the fix test once it works with python3 under root user
+%ifpython3
+rm -rf .testrepository
+PYTHON=python3 %{__python3} setup.py testr --testr-args='^(?!.*test_run_as)'
+%endif
-%files
+%files %{python_files}
%license LICENSE
%doc ChangeLog README.rst
-%{python2_sitelib}/oslo_rootwrap
-%{python2_sitelib}/*.egg-info
-%{_bindir}/oslo-rootwrap
-%{_bindir}/oslo-rootwrap-daemon
+%{python_sitelib}/oslo_rootwrap
+%{python_sitelib}/*.egg-info
+%python_alternative %{_bindir}/oslo-rootwrap
+%python_alternative %{_bindir}/oslo-rootwrap-daemon
-%files doc
+%files -n python-oslo.rootwrap-doc
%license LICENSE
%doc doc/build/html
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2a9XNV/_old 2018-09-07 15:39:07.586554007 +0200
+++ /var/tmp/diff_new_pack.2a9XNV/_new 2018-09-07 15:39:07.586554007 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2</param>
<param name="output-name">python-oslo.rootwrap.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/oslo.rootwrap/stable/rocky/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,oslo.rootwrap</param>
</service>
++++++ oslo.rootwrap-5.13.0.tar.gz -> oslo.rootwrap-5.14.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/.zuul.yaml
new/oslo.rootwrap-5.14.1/.zuul.yaml
--- old/oslo.rootwrap-5.13.0/.zuul.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/.zuul.yaml 2018-05-15 06:13:48.000000000 +0200
@@ -0,0 +1,7 @@
+- project:
+ check:
+ jobs:
+ - openstack-tox-lower-constraints
+ gate:
+ jobs:
+ - openstack-tox-lower-constraints
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/AUTHORS
new/oslo.rootwrap-5.14.1/AUTHORS
--- old/oslo.rootwrap-5.13.0/AUTHORS 2018-01-08 15:17:50.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/AUTHORS 2018-05-15 06:17:16.000000000 +0200
@@ -2,12 +2,14 @@
Andreas Jaeger <a...@suse.com>
Angus Lees <g...@inodes.org>
Bogdan Dobrelya <bdobre...@mirantis.com>
+Brian Haley <bha...@redhat.com>
Cedric Brandily <zze...@gmail.com>
ChangBo Guo(gcb) <eric....@easystack.cn>
Christian Berendt <bere...@b1-systems.de>
Claudiu Belu <cb...@cloudbasesolutions.com>
Corey Bryant <corey.bry...@canonical.com>
Cyril Roelandt <cyril.roela...@enovance.com>
+Daniel Alvarez <dalva...@redhat.com>
Davanum Srinivas <dava...@gmail.com>
Davanum Srinivas <d...@linux.vnet.ibm.com>
Dina Belova <dbel...@mirantis.com>
@@ -21,6 +23,7 @@
James Carey <jeca...@us.ibm.com>
Jeremy Stanley <fu...@yuggoth.org>
Julien Danjou <jul...@danjou.info>
+Kenneth Giusti <kgiu...@gmail.com>
Kirill Bespalov <kbespa...@mirantis.com>
Mark McClain <mark.mccl...@dreamhost.com>
Mark McLoughlin <mar...@redhat.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/ChangeLog
new/oslo.rootwrap-5.14.1/ChangeLog
--- old/oslo.rootwrap-5.13.0/ChangeLog 2018-01-08 15:17:50.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/ChangeLog 2018-05-15 06:17:16.000000000 +0200
@@ -1,6 +1,27 @@
CHANGES
=======
+5.14.1
+------
+
+* Make IpNetnsExecFilter more strict to detect aliases
+* Remove stale pip-missing-reqs tox test
+* Trivial: Update pypi url to new url
+
+5.14.0
+------
+
+* set default python to python3
+* fix lower constraints and uncap eventlet
+* Update to support running benchmark on python3
+* add lower-constraints job
+* Updated from global requirements
+* Update links in README
+* Update reno for stable/queens
+* Updated from global requirements
+* Updated from global requirements
+* Treat doc warnings as errors
+
5.13.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/PKG-INFO
new/oslo.rootwrap-5.14.1/PKG-INFO
--- old/oslo.rootwrap-5.13.0/PKG-INFO 2018-01-08 15:17:51.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/PKG-INFO 2018-05-15 06:17:17.000000000 +0200
@@ -1,18 +1,17 @@
Metadata-Version: 1.1
Name: oslo.rootwrap
-Version: 5.13.0
+Version: 5.14.1
Summary: Oslo Rootwrap
Home-page: https://docs.openstack.org/oslo.rootwrap/latest/
Author: OpenStack
Author-email: openstack-...@lists.openstack.org
License: UNKNOWN
-Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
- .. image:: http://governance.openstack.org/badges/oslo.rootwrap.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+ .. image:: https://governance.openstack.org/tc/badges/oslo.rootwrap.svg
+ :target:
https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on
@@ -21,11 +20,11 @@
===============================================
.. image:: https://img.shields.io/pypi/v/oslo.rootwrap.svg
- :target: https://pypi.python.org/pypi/oslo.rootwrap/
+ :target: https://pypi.org/project/oslo.rootwrap/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/oslo.rootwrap.svg
- :target: https://pypi.python.org/pypi/oslo.rootwrap/
+ :target: https://pypi.org/project/oslo.rootwrap/
:alt: Downloads
oslo.rootwrap allows fine-grained filtering of shell commands to run
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/README.rst
new/oslo.rootwrap-5.14.1/README.rst
--- old/oslo.rootwrap-5.13.0/README.rst 2018-01-08 15:15:41.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/README.rst 2018-05-15 06:13:48.000000000 +0200
@@ -2,8 +2,8 @@
Team and repository tags
========================
-.. image:: http://governance.openstack.org/badges/oslo.rootwrap.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/oslo.rootwrap.svg
+ :target: https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on
@@ -12,11 +12,11 @@
===============================================
.. image:: https://img.shields.io/pypi/v/oslo.rootwrap.svg
- :target: https://pypi.python.org/pypi/oslo.rootwrap/
+ :target: https://pypi.org/project/oslo.rootwrap/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/oslo.rootwrap.svg
- :target: https://pypi.python.org/pypi/oslo.rootwrap/
+ :target: https://pypi.org/project/oslo.rootwrap/
:alt: Downloads
oslo.rootwrap allows fine-grained filtering of shell commands to run
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/RELEASENOTES.rst
new/oslo.rootwrap-5.14.1/RELEASENOTES.rst
--- old/oslo.rootwrap-5.13.0/RELEASENOTES.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/oslo.rootwrap-5.14.1/RELEASENOTES.rst 2018-05-15 06:17:17.000000000
+0200
@@ -0,0 +1,3 @@
+=============
+oslo.rootwrap
+=============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/benchmark/benchmark.py
new/oslo.rootwrap-5.14.1/benchmark/benchmark.py
--- old/oslo.rootwrap-5.13.0/benchmark/benchmark.py 2018-01-08
15:15:41.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/benchmark/benchmark.py 2018-05-15
06:13:48.000000000 +0200
@@ -18,6 +18,7 @@
import atexit
import math
import os
+import six
import subprocess
import sys
import timeit
@@ -34,6 +35,9 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, err = obj.communicate()
+ if six.PY3:
+ out = os.fsdecode(out)
+ err = os.fsdecode(err)
return obj.returncode, out, err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/doc/requirements.txt
new/oslo.rootwrap-5.14.1/doc/requirements.txt
--- old/oslo.rootwrap-5.13.0/doc/requirements.txt 2018-01-08
15:15:51.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/doc/requirements.txt 2018-05-15
06:13:48.000000000 +0200
@@ -2,8 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# These are needed for docs generation
-openstackdocstheme>=1.17.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
reno>=2.5.0 # Apache-2.0
mock>=2.0.0 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/lower-constraints.txt
new/oslo.rootwrap-5.14.1/lower-constraints.txt
--- old/oslo.rootwrap-5.13.0/lower-constraints.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/lower-constraints.txt 2018-05-15
06:13:48.000000000 +0200
@@ -0,0 +1,47 @@
+alabaster==0.7.10
+appdirs==1.3.0
+Babel==2.3.4
+bandit==1.1.0
+docutils==0.11
+dulwich==0.15.0
+eventlet==0.18.2
+extras==1.0.0
+fixtures==3.0.0
+flake8==2.5.5
+gitdb==0.6.4
+GitPython==1.0.1
+greenlet==0.4.10
+hacking==0.12.0
+imagesize==0.7.1
+iso8601==0.1.11
+Jinja2==2.10
+keystoneauth1==3.4.0
+linecache2==1.0.0
+MarkupSafe==1.0
+mccabe==0.2.1
+mock==2.0.0
+mox3==0.20.0
+openstackdocstheme==1.18.1
+os-client-config==1.28.0
+oslotest==3.2.0
+pbr==2.0.0
+pep8==1.5.7
+pyflakes==0.8.1
+Pygments==2.2.0
+python-mimeparse==1.6.0
+python-subunit==1.0.0
+pytz==2013.6
+PyYAML==3.12
+reno==2.5.0
+requests==2.14.2
+requestsexceptions==1.2.0
+six==1.10.0
+smmap==0.9.0
+snowballstemmer==1.2.1
+Sphinx==1.6.2
+sphinxcontrib-websupport==1.0.1
+stevedore==1.20.0
+testrepository==0.0.18
+testtools==2.2.0
+traceback2==1.4.0
+unittest2==1.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/oslo.rootwrap.egg-info/PKG-INFO
new/oslo.rootwrap-5.14.1/oslo.rootwrap.egg-info/PKG-INFO
--- old/oslo.rootwrap-5.13.0/oslo.rootwrap.egg-info/PKG-INFO 2018-01-08
15:17:50.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/oslo.rootwrap.egg-info/PKG-INFO 2018-05-15
06:17:16.000000000 +0200
@@ -1,18 +1,17 @@
Metadata-Version: 1.1
Name: oslo.rootwrap
-Version: 5.13.0
+Version: 5.14.1
Summary: Oslo Rootwrap
Home-page: https://docs.openstack.org/oslo.rootwrap/latest/
Author: OpenStack
Author-email: openstack-...@lists.openstack.org
License: UNKNOWN
-Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
- .. image:: http://governance.openstack.org/badges/oslo.rootwrap.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+ .. image:: https://governance.openstack.org/tc/badges/oslo.rootwrap.svg
+ :target:
https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on
@@ -21,11 +20,11 @@
===============================================
.. image:: https://img.shields.io/pypi/v/oslo.rootwrap.svg
- :target: https://pypi.python.org/pypi/oslo.rootwrap/
+ :target: https://pypi.org/project/oslo.rootwrap/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/oslo.rootwrap.svg
- :target: https://pypi.python.org/pypi/oslo.rootwrap/
+ :target: https://pypi.org/project/oslo.rootwrap/
:alt: Downloads
oslo.rootwrap allows fine-grained filtering of shell commands to run
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.13.0/oslo.rootwrap.egg-info/SOURCES.txt
new/oslo.rootwrap-5.14.1/oslo.rootwrap.egg-info/SOURCES.txt
--- old/oslo.rootwrap-5.13.0/oslo.rootwrap.egg-info/SOURCES.txt 2018-01-08
15:17:51.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/oslo.rootwrap.egg-info/SOURCES.txt 2018-05-15
06:17:17.000000000 +0200
@@ -1,9 +1,11 @@
.testr.conf
+.zuul.yaml
AUTHORS
CONTRIBUTING.rst
ChangeLog
LICENSE
README.rst
+lower-constraints.txt
requirements.txt
setup.cfg
setup.py
@@ -47,6 +49,7 @@
releasenotes/source/index.rst
releasenotes/source/ocata.rst
releasenotes/source/pike.rst
+releasenotes/source/queens.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/oslo.rootwrap.egg-info/pbr.json
new/oslo.rootwrap-5.14.1/oslo.rootwrap.egg-info/pbr.json
--- old/oslo.rootwrap-5.13.0/oslo.rootwrap.egg-info/pbr.json 2018-01-08
15:17:50.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/oslo.rootwrap.egg-info/pbr.json 2018-05-15
06:17:16.000000000 +0200
@@ -1 +1 @@
-{"git_version": "68a6492", "is_release": true}
\ No newline at end of file
+{"git_version": "9b632e2", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/oslo_rootwrap/filters.py
new/oslo.rootwrap-5.14.1/oslo_rootwrap/filters.py
--- old/oslo.rootwrap-5.13.0/oslo_rootwrap/filters.py 2018-01-08
15:15:41.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/oslo_rootwrap/filters.py 2018-05-15
06:13:48.000000000 +0200
@@ -18,6 +18,10 @@
import shutil
import sys
+NETNS_VARS = ('net', 'netn', 'netns')
+EXEC_VARS = ('e', 'ex', 'exe', 'exec')
+
+
if sys.platform != 'win32':
# NOTE(claudiub): pwd is a Linux-specific library, and currently there is
# no Windows support for oslo.rootwrap.
@@ -274,8 +278,8 @@
if userargs[0] == 'ip':
# Avoid the 'netns exec' command here
for a, b in zip(userargs[1:], userargs[2:]):
- if a == 'netns':
- return (b != 'exec')
+ if a in NETNS_VARS:
+ return b not in EXEC_VARS
else:
return True
@@ -373,7 +377,8 @@
if self.run_as != "root" or len(userargs) < 4:
return False
- return (userargs[:3] == ['ip', 'netns', 'exec'])
+ return (userargs[0] == 'ip' and userargs[1] in NETNS_VARS
+ and userargs[2] in EXEC_VARS)
def exec_args(self, userargs):
args = userargs[4:]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.13.0/oslo_rootwrap/tests/test_rootwrap.py
new/oslo.rootwrap-5.14.1/oslo_rootwrap/tests/test_rootwrap.py
--- old/oslo.rootwrap-5.13.0/oslo_rootwrap/tests/test_rootwrap.py
2018-01-08 15:15:41.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/oslo_rootwrap/tests/test_rootwrap.py
2018-05-15 06:13:48.000000000 +0200
@@ -328,6 +328,8 @@
self.assertFalse(f.match(['ip', 'netns', 'exec']))
self.assertFalse(f.match(['ip', '-s', 'netns', 'exec']))
self.assertFalse(f.match(['ip', '-l', '42', 'netns', 'exec']))
+ self.assertFalse(f.match(['ip', 'net', 'exec', 'foo']))
+ self.assertFalse(f.match(['ip', 'netns', 'e', 'foo']))
def _test_IpFilter_netns_helper(self, action):
f = filters.IpFilter(self._ip, 'root')
@@ -346,10 +348,19 @@
f = filters.IpNetnsExecFilter(self._ip, 'root')
self.assertTrue(
f.match(['ip', 'netns', 'exec', 'foo', 'ip', 'link', 'list']))
+ self.assertTrue(f.match(['ip', 'net', 'exec', 'foo', 'bar']))
+ self.assertTrue(f.match(['ip', 'netn', 'e', 'foo', 'bar']))
+ self.assertTrue(f.match(['ip', 'net', 'e', 'foo', 'bar']))
+ self.assertTrue(f.match(['ip', 'net', 'exe', 'foo', 'bar']))
def test_IpNetnsExecFilter_nomatch(self):
f = filters.IpNetnsExecFilter(self._ip, 'root')
self.assertFalse(f.match(['ip', 'link', 'list']))
+ self.assertFalse(f.match(['ip', 'foo', 'bar', 'netns']))
+ self.assertFalse(f.match(['ip', '-s', 'netns', 'exec']))
+ self.assertFalse(f.match(['ip', '-l', '42', 'netns', 'exec']))
+ self.assertFalse(f.match(['ip', 'netns exec', 'foo', 'bar', 'baz']))
+ self.assertFalse(f.match([]))
# verify that at least a NS is given
self.assertFalse(f.match(['ip', 'netns', 'exec']))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/releasenotes/notes/reno.cache
new/oslo.rootwrap-5.14.1/releasenotes/notes/reno.cache
--- old/oslo.rootwrap-5.13.0/releasenotes/notes/reno.cache 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/releasenotes/notes/reno.cache 2018-05-15
06:17:17.000000000 +0200
@@ -0,0 +1,3 @@
+---
+file-contents: {}
+notes: []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/releasenotes/source/index.rst
new/oslo.rootwrap-5.14.1/releasenotes/source/index.rst
--- old/oslo.rootwrap-5.13.0/releasenotes/source/index.rst 2018-01-08
15:15:41.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/releasenotes/source/index.rst 2018-05-15
06:13:48.000000000 +0200
@@ -6,5 +6,6 @@
:maxdepth: 1
unreleased
+ queens
pike
ocata
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/releasenotes/source/queens.rst
new/oslo.rootwrap-5.14.1/releasenotes/source/queens.rst
--- old/oslo.rootwrap-5.13.0/releasenotes/source/queens.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/releasenotes/source/queens.rst 2018-05-15
06:13:48.000000000 +0200
@@ -0,0 +1,6 @@
+===================================
+ Queens Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/setup.cfg
new/oslo.rootwrap-5.14.1/setup.cfg
--- old/oslo.rootwrap-5.13.0/setup.cfg 2018-01-08 15:17:51.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/setup.cfg 2018-05-15 06:17:17.000000000 +0200
@@ -27,15 +27,6 @@
oslo-rootwrap = oslo_rootwrap.cmd:main
oslo-rootwrap-daemon = oslo_rootwrap.cmd:daemon
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
[wheel]
universal = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/test-requirements.txt
new/oslo.rootwrap-5.14.1/test-requirements.txt
--- old/oslo.rootwrap-5.13.0/test-requirements.txt 2018-01-08
15:15:41.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/test-requirements.txt 2018-05-15
06:13:48.000000000 +0200
@@ -9,16 +9,16 @@
testtools>=2.2.0 # MIT
# this is required for the docs build jobs
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+oslotest>=3.2.0 # Apache-2.0
# mocking framework
mock>=2.0.0 # BSD
# rootwrap daemon's client should be verified to run in eventlet
-eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
+eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.13.0/tox.ini
new/oslo.rootwrap-5.14.1/tox.ini
--- old/oslo.rootwrap-5.13.0/tox.ini 2018-01-08 15:15:51.000000000 +0100
+++ new/oslo.rootwrap-5.14.1/tox.ini 2018-05-15 06:13:48.000000000 +0200
@@ -3,6 +3,7 @@
envlist = py35,py27,pep8
[testenv]
+basepython = python3
install_command = pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
@@ -15,6 +16,9 @@
python setup.py testr --slowest
--testr-args='(?!tests.test_functional_eventlet)tests {posargs}'
env TEST_EVENTLET=1 python setup.py testr --slowest
--testr-args='tests.test_functional_eventlet'
+[testenv:py27]
+basepython = python2.7
+
[testenv:pep8]
deps =
-r{toxinidir}/test-requirements.txt
@@ -35,23 +39,25 @@
[testenv:docs]
deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -b html doc/source doc/build/html
+commands = sphinx-build -W -b html doc/source doc/build/html
[flake8]
show-source = True
exclude = .tox,dist,doc,*.egg,build
[testenv:benchmark]
+basepython = python2.7
commands = python benchmark/benchmark.py
-[testenv:pip-missing-reqs]
-# do not install test-requirements as that will pollute the virtualenv for
-# determining missing packages
-# this also means that pip-missing-reqs must be installed separately, outside
-# of the requirements.txt files
-deps = pip_missing_reqs
-commands = pip-missing-reqs -d --ignore-module=oslo_rootwrap*
--ignore-module=pkg_resources --ignore-file=oslo_rootwrap/test.py
--ignore-file=oslo_rootwrap/tests/* oslo_rootwrap
+[testenv:benchmark3]
+commands = python3 benchmark/benchmark.py
[testenv:releasenotes]
deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
+
+[testenv:lower-constraints]
+deps =
+ -c{toxinidir}/lower-constraints.txt
+ -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
