September 2016 - openSUSE Commits - openSUSE Mailing Lists

commit steam for openSUSE:Factory:NonFree
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package steam for openSUSE:Factory:NonFree checked in at 2016-09-30 15:35:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/steam (Old) and /work/SRC/openSUSE:Factory:NonFree/.steam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "steam" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/steam/steam.changes 2016-09-23 13:36:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.steam.new/steam.changes 2016-09-30 15:35:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 26 01:45:34 UTC 2016 - jimmy(a)boombatower.com + +- correct replacement of 64bit openssl libraries in steamruntime. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ steamruntime-fix ++++++ --- /var/tmp/diff_new_pack.7NhUTD/_old 2016-09-30 15:35:54.000000000 +0200 +++ /var/tmp/diff_new_pack.7NhUTD/_new 2016-09-30 15:35:54.000000000 +0200 @@ -5,7 +5,7 @@ echo "bringing in our fixed openssl libraries" for lib in libcrypto.so.1.0.0 libssl.so.1.0.0; do - find ~/.local/share/Steam/ubuntu12_32/ -name $lib | while read a + find ~/.local/share/Steam/ubuntu12_32/steam-runtime/i386 -name $lib | while read a do if [ -f /usr/lib/steam/lib/$lib ]; then rm $a @@ -13,7 +13,7 @@ fi done - find ~/.local/share/Steam/ubuntu12_64/ -name $lib | while read a + find ~/.local/share/Steam/ubuntu12_32/steam-runtime/amd64 -name $lib | while read a do if [ -f /usr/lib/steam/lib64/$lib ]; then rm $a

1 0

commit irssi for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2016-09-30 15:35:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irssi" Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2016-09-23 11:40:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.irssi.new/irssi.changes 2016-09-30 15:35:48.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 21 22:24:11 UTC 2016 - mrueckert(a)suse.de + +- disable PIE on sle11 + +------------------------------------------------------------------- +Wed Sep 21 22:07:13 UTC 2016 - mrueckert(a)suse.de + +- add BR for xz to fix build on sle11 +- switch to %{?_smp_mflags} +- pass --disable-silent-rules to get verbose makefiles again + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.T6s7WM/_old 2016-09-30 15:35:51.000000000 +0200 +++ /var/tmp/diff_new_pack.T6s7WM/_new 2016-09-30 15:35:51.000000000 +0200 @@ -38,6 +38,7 @@ BuildRequires: perl-macros %endif BuildRequires: perl +BuildRequires: xz Conflicts: %{name}-snapshot # Url: http://www.irssi.org @@ -108,9 +109,16 @@ %if 0%{?sles_version} == 9 export PKG_CONFIG_PATH="/opt/gnome/%{_lib}/pkgconfig:$PKG_CONFIG_PATH" %endif -export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS -fPIE" + +export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS" + +%if 0%{?suse_version} > 1110 +export CFLAGS="$CFLAGS -fPIE" export LDFLAGS="-pie" +%endif + %configure \ + --disable-silent-rules \ --enable-ipv6 \ --with-bot \ --with-proxy \ @@ -124,10 +132,10 @@ --enable-true-color \ --with-perl=yes \ --with-perl-lib=vendor -%__make %{?jobs:-j%{jobs}} all +%__make %{?_smp_mflags} all V=1 %install -%makeinstall docdir=%{_docdir}/%{name} +%makeinstall docdir=%{_docdir}/%{name} V=1 %perl_process_packlist %__rm %{buildroot}%{_libdir}/irssi/modules/libirc_proxy.{a,la}

1 0

commit python-keystoneauth1 for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package python-keystoneauth1 for openSUSE:Factory checked in at 2016-09-30 15:35:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keystoneauth1 (Old) and /work/SRC/openSUSE:Factory/.python-keystoneauth1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-keystoneauth1" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keystoneauth1/python-keystoneauth1.changes 2016-05-04 08:19:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-keystoneauth1.new/python-keystoneauth1.changes 2016-09-30 15:35:45.000000000 +0200 @@ -1,0 +2,159 @@ +Wed Aug 31 13:10:19 UTC 2016 - tbechtold(a)suse.com + +update to version 2.12.1 + * get_endpoint should return None when no version found + +------------------------------------------------------------------- +Tue Aug 30 15:41:49 UTC 2016 - tbechtold(a)suse.com + +update to version 2.12.0 + * Allow identity plugins to discover relative version urls + * Disables TCP_KEEPCNT when using Windows Subsystem for Linux + * User-agent header shouldn't start with a space + * Add tests for user-agent with odd sys.argv + * add status code 308 to _REDIRECT_STATUSES + * Update the home-page in setup.cfg + * Updated from global requirements + +------------------------------------------------------------------- +Wed Aug 10 14:45:32 UTC 2016 - tbechtold(a)suse.com + +- update to version 2.11.0 + * Add tests for YamlJsonSerializer + * Add missing class name to tuple of public objects + * Fix arguments to _auth_required() + * Don't include openstack/common in flake8 exclude list + * Fix the doc error in "using-session" + * Improve authentication plugins documentation + * Use assertEqual() instead of assertDictEqual() + * Updated from global requirements + * Correctly report available for ADFS plugin + +------------------------------------------------------------------- +Sun Aug 7 12:26:55 UTC 2016 - dmueller(a)suse.com + +- update to 2.10.0: + * Lazy load oauthlib for plugin loading + * oidc: add missing 'OidcAccessToken' to __all__ + * oidc: implement client_credentials grant type + * Fix ECP doc link in Saml2 Password class doc + * Updated from global requirements + * Fix link for "extras dependencies" in extras doc + * Add pretty serializer for betamax fixture + * Update hacking to global-requirements value + * Use SAML2 requests plugin + * Updated from global requirements + * oidc: move the get_unscoped_auth_ref into the base class + * oidc: deprecate grant_type argument + * oidc: add discovery document support + * Add additional_headers to session and adapter + * Add Python 3.5 classifier and venv + * remove unused LOG + * Updated from global requirements + * Updated from global requirements + * Add prompt parameter to Opt + * Auth plugin for X.509 tokenless authentication + * oidc: fix OpenID scope management + * Add create_plugin to loader + +------------------------------------------------------------------- +Mon Jul 11 14:26:10 UTC 2016 - tbechtold(a)suse.com + +- update to 2.9.0: + * Updated from global requirements + * move release note to correct directory + * oidc: fix OpenID Connect scope option + * oidc: add tests for plugin loader + * Don't mock the session.request function + * oidc: refactor unit tests + * Fix code example for OAuth1 authentication + * Add entrypoint for Federated Kerberos + * Fix kerberos available property + * Document named kerberos plugin + * Support TOTP auth plugin + * Make the kerberos plugin loadable + * Add available flag to plugin loaders + * PEP257: Ignore D203 because it was deprecated + * Apply a heuristic for product name if a user_agent is not provided + +------------------------------------------------------------------- +Sun Jun 19 20:19:07 UTC 2016 - dmueller(a)suse.com + +- update to 2.8.0: + * Updated from global requirements + * Let Oidc* auth plugins accept scope parameters as kwargs + * Update keystoneauth fixture to support v3 + * Check that all defined entry points can be loaded + * Use betamax hooks to mask fixture results + * oidc: fix typo on class name + * oidc: fix option definition + * oidc: add OidcAccessToken class to authenticate reusing an access token + * oidc: fix typo in docstring + * oidc: DRY when obtaining an access token + * oidc: DRY when obtaining a keystone token + * oidc: Remove unused parameters in _OidcBase + * Add is_domain to keystoneauth token + * docstring: fix typo + * Add oauth plugin to keystoneauth + * Expose is_admin_project in AccessInfo + * Expose allow parameters for URL discovery + * Refactor variables for fixture and service + * Enable bandit + * Lazy import oslo_config as required + * Add 303 as redirect code for k2k plugin + * Updated from global requirements + * Fix H405, D105, D200, and D203 PEP257 + * Updated from global requirements + * Fixing D204, D205, D208, and D211 pep8 + * Fixing D301 docstring + * Removing tox ignore D400 + * Fix documentation example again + * Include query string in request logging + * Removing tox ignore D401 and make keystoneauth compliant + +------------------------------------------------------------------- +Mon Jun 6 20:06:26 UTC 2016 - dmueller(a)suse.com + +- switch to upstream maintained package +- update to 2.6.0: + * Allow to send different recorders to betamax + * Fix doc build if git is absent + * Updated from global requirements + * Updated from global requirements + * fix OrderedDict mutated during iteration + * Fix for PEP8 violation - D202 (No blank lines allowed after function docstring.) + * Examples for migration from keystoneclient + * Renamed endpoint to interface in docstring + * Keystoneauth Authentication Plugin doc typo + * Allow seeing full token response when debug enabled + * Update reno for stable/mitaka + * Examples for kerberos and saml2 plugins + * Adding authentication compatibility for OpenStackClient + * Swap the order of username deprecation + * Fix exported symbol in identity.v3 + * Editorial nits for docs + * Improve usability of docs + * Add links to federation plugins + * Remove unavailable parameter + * Generate FederationBaseAuth constructor parameters + * Update test run instructions + * Fix typos and improve formatting in migrating.rst + * Updated from global requirements + * Updated from global requirements + * Cleanup docstrings + * Fix docstring in identity.v3.oidc module + * Cleanup test-requirements.txt + * Updated from global requirements + * Allow parameter expansion in endpoint_override + * Updated from global requirements + * Updated from global requirements + * Updated from global requirements + * Use positional library instead of our own copy + * Remove argparse from requirements + * HTTPError should contain 'retry_after' parameter + * Updated from global requirements + * Remove keyring as a test-requiremnet + * Mark password/secret options as secret + * Replace deprecated library function os.popen() with subprocess + +------------------------------------------------------------------- Old: ---- keystoneauth1-2.2.0.tar.gz New: ---- keystoneauth1-2.12.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keystoneauth1.spec ++++++ --- /var/tmp/diff_new_pack.3PzIeL/_old 2016-09-30 15:35:47.000000000 +0200 +++ /var/tmp/diff_new_pack.3PzIeL/_new 2016-09-30 15:35:47.000000000 +0200 @@ -17,23 +17,44 @@ %global sname keystoneauth1 - Name: python-keystoneauth1 -Version: 2.2.0 +Version: 2.12.1 Release: 0 Summary: OpenStack authenticating tools License: Apache-2.0 +Group: Development/Languages/Python Url: https://launchpad.net/%{sname} -Source0: https://pypi.python.org/packages/source/k/%{sname}/%{sname}-%{version}.tar.… +Source0: https://pypi.io/packages/source/k/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: python-pbr -BuildRequires: python-setuptools -Requires: python-iso8601 >= 0.1.9 +BuildRequires: python-PyYAML >= 3.1.0 +BuildRequires: python-betamax >= 0.7.0 +BuildRequires: python-fixtures >= 3.0.0 +BuildRequires: python-iso8601 >= 0.1.11 +BuildRequires: python-lxml >= 2.3 +BuildRequires: python-mock >= 2.0 +BuildRequires: python-oauthlib >= 0.6 +BuildRequires: python-oslo.config >= 3.14.0 +BuildRequires: python-oslo.utils >= 3.16.0 +BuildRequires: python-oslotest >= 1.10.0 +BuildRequires: python-pbr >= 1.6 +BuildRequires: python-pep8 >= 1.5.7 +BuildRequires: python-positional >= 1.0.1 +BuildRequires: python-pycrypto >= 2.6 +BuildRequires: python-reno >= 1.8.0 +BuildRequires: python-requests-kerberos >= 0.6 +BuildRequires: python-requests-mock >= 1.0 +BuildRequires: python-testrepository >= 0.0.18 +BuildRequires: python-testresources >= 0.2.4 +BuildRequires: python-testtools >= 1.4.0 +Requires: python-PyYAML >= 3.1.0 +Requires: python-iso8601 >= 0.1.11 Requires: python-lxml >= 2.3 -Requires: python-requests >= 2.8.1 +Requires: python-oauthlib >= 0.6 +Requires: python-positional >= 1.0.1 +Requires: python-requests >= 2.10.0 Requires: python-requests-kerberos >= 0.6 Requires: python-six >= 1.9.0 -Requires: python-stevedore >= 1.5.0 +Requires: python-stevedore >= 1.16.0 BuildArch: noarch %description @@ -45,8 +66,9 @@ %package doc Summary: Documentation for OpenStack authenticating tools +Group: Development/Languages/Python BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx +BuildRequires: python-oslosphinx >= 2.5.0 %description doc Documentation for OpenStack authenticating tools. @@ -55,16 +77,19 @@ %setup -q -n %{sname}-%{version} %build -%{__python2} setup.py build +%{py2_build} %install -%{__python2} setup.py install --skip-build --root %{buildroot} +%{py2_install} # generate html docs %{__python2} setup.py build_sphinx # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} +%check +%{__python2} setup.py testr + %files %license LICENSE %doc AUTHORS ChangeLog README.rst ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3PzIeL/_old 2016-09-30 15:35:48.000000000 +0200 +++ /var/tmp/diff_new_pack.3PzIeL/_new 2016-09-30 15:35:48.000000000 +0200 @@ -1,4 +1,9 @@ <services> + <service mode="disabled" name="renderspec"> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/…</param> + <param name="output-name">python-keystoneauth1.spec</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-req…</param> + </service> <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> </service> @@ -8,6 +13,6 @@ <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> - <service name="python_requires" mode="disabled"> + <service name="format_spec_file" mode="disabled"> </service> </services> ++++++ keystoneauth1-2.2.0.tar.gz -> keystoneauth1-2.12.1.tar.gz ++++++ ++++ 9857 lines of diff (skipped)

1 0

commit qwt6 for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package qwt6 for openSUSE:Factory checked in at 2016-09-30 15:35:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt6 (Old) and /work/SRC/openSUSE:Factory/.qwt6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qwt6" Changes: -------- --- /work/SRC/openSUSE:Factory/qwt6/qwt6.changes 2015-02-11 16:46:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qwt6.new/qwt6.changes 2016-09-30 15:35:38.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Sep 29 06:03:11 UTC 2016 - aloisio(a)gmx.com + +- Update to version 6.1.3 + * QwtPlotMagnifier, QwtPlotZoomer: handling of non linear + transformations ( f.e logarithmic ) + * Date/Time scales fixed + QwtDate::ceil(), QwtDate::weekNumber(), QwtDate::utcOffset() + QwtDateScaleEngine fixed when aligning to months + * QwtPlotLayout: layout bug for legends witdh visisble + scrollbars fixed + * Plot items + hiding QwtPlotLegendItem without entries + QwtPlotShapeItem render code fixed + * QwtPlotGLCanvas + slightly improved, nevertheless better use Qwt 6.2 when being + interested in OpenGL + * Other + QwtGraphic boundingRect updates fixed + QwtSyntheticPointData::x() fixed + QwtLogScaleEngine::divideScale ignoring stepSize parameter + for ranges below one "decade" + QwtPlotAbstractBarChart::getCanvasMarginHint fixed + +- Fixed source URL + +------------------------------------------------------------------- Old: ---- qwt-6.1.2.tar.bz2 New: ---- qwt-6.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt6.spec ++++++ --- /var/tmp/diff_new_pack.0AiwXn/_old 2016-09-30 15:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.0AiwXn/_new 2016-09-30 15:35:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qwt6 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: qwt6 -Version: 6.1.2 +Version: 6.1.3 Release: 0 Summary: Qt Widgets for Technical Applications License: SUSE-QWT-1.0 Group: Development/Libraries/C and C++ Url: http://qwt.sourceforge.net/ -Source: http://switch.dl.sourceforge.net/sourceforge/qwt/qwt-%{version}.tar.bz2 +Source: https://sourceforge.net/projects/qwt/files/qwt/%{version}/qwt-%{version}.ta… # PATCH-FIX-OPENSUSE to prevent 'ERROR: RPATH "/usr/local/qwt-6.1.0/lib" on # /usr/lib(64)/qt4/plugins/designer/libqwt_designer_plugin.so is not allowed'. Patch0: qwt-rpath.patch ++++++ qwt-6.1.2.tar.bz2 -> qwt-6.1.3.tar.bz2 ++++++ ++++ 190041 lines of diff (skipped)

1 0

commit python-oslo.concurrency for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package python-oslo.concurrency for openSUSE:Factory checked in at 2016-09-30 15:35:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.concurrency (Old) and /work/SRC/openSUSE:Factory/.python-oslo.concurrency.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.concurrency" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.concurrency/python-oslo.concurrency.changes 2016-05-04 08:20:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.concurrency.new/python-oslo.concurrency.changes 2016-09-30 15:35:36.000000000 +0200 @@ -1,0 +2,44 @@ +Tue Aug 30 16:22:27 UTC 2016 - tbechtold(a)suse.com + +- update to version 3.14.0 + * Fix external lock tests on Windows + * Updated from global requirements + +------------------------------------------------------------------- +Wed Aug 10 14:35:56 UTC 2016 - tbechtold(a)suse.com + +- update to version 3.13.0 + * Add Python 3.5 classifier and venv + * Imported Translations from Zanata + * Fix parameters of assertEqual are misplaced + * Updated from global requirements + * Add reno for releasenotes management + +------------------------------------------------------------------- +Fri Jun 3 13:17:59 UTC 2016 - tbechtold(a)suse.com + +- update to 3.9.0: + * Add doc/ to pep8 check + * Remove unused import statement + * Add timeout option to ssh_execute + * Fix wrong import example in docstring + * Trivial: ignore openstack/common in flake8 exclude list + * Updated from global requirements + * Imported Translations from Zanata + * processutils: add support for missing process limits + * Remove direct dependency on babel + * Updated from global requirements + * Updated from global requirements + * Updated from global requirements + * Add a few usage examples for lockutils + * Revert "Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not set" + * Updated from global requirements + * Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not set + +------------------------------------------------------------------- +Thu Jun 2 08:55:41 UTC 2016 - tbechtold(a)suse.com + +- use renderspec source service +- update spec from upstream + +------------------------------------------------------------------- Old: ---- oslo.concurrency-3.7.0.tar.gz New: ---- oslo.concurrency-3.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.concurrency.spec ++++++ --- /var/tmp/diff_new_pack.vEcZCL/_old 2016-09-30 15:35:38.000000000 +0200 +++ /var/tmp/diff_new_pack.vEcZCL/_new 2016-09-30 15:35:38.000000000 +0200 @@ -16,87 +16,87 @@ # -%define version_unconverted 3.7.0 - +%global sname oslo.concurrency Name: python-oslo.concurrency -Version: 3.7.0 +Version: 3.14.0 Release: 0 -Summary: OpenStack Oslo concurrency library +Summary: OpenStack oslo.concurrency library License: Apache-2.0 Group: Development/Languages/Python -Url: http://launchpad.net/oslo -Source: https://pypi.python.org/packages/source/o/oslo.concurrency/oslo.concurrency… -BuildRequires: openstack-suse-macros +Url: https://launchpad.net/%{sname} +Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +BuildRequires: openstack-macros BuildRequires: python-devel BuildRequires: python-enum34 -BuildRequires: python-eventlet -BuildRequires: python-fasteners -BuildRequires: python-fixtures -BuildRequires: python-futures -BuildRequires: python-mock -BuildRequires: python-oslo.config -BuildRequires: python-oslo.utils -BuildRequires: python-oslosphinx -BuildRequires: python-oslotest -BuildRequires: python-pbr -BuildRequires: python-retrying -BuildRequires: python-setuptools -BuildRequires: python-sphinx -BuildRequires: python-testrepository -Requires: python-Babel >= 1.3 +BuildRequires: python-eventlet >= 0.18.2 +BuildRequires: python-fasteners >= 0.7 +BuildRequires: python-fixtures >= 3.0.0 +BuildRequires: python-futures >= 3.0 +BuildRequires: python-mock >= 2.0 +BuildRequires: python-oslo.config >= 3.14.0 +BuildRequires: python-oslo.i18n >= 2.1.0 +BuildRequires: python-oslo.utils >= 3.16.0 +BuildRequires: python-oslotest >= 1.10.0 +BuildRequires: python-pbr >= 1.6 +BuildRequires: python-testrepository >= 0.0.18 +BuildRequires: python-testscenarios >= 0.4 +BuildRequires: python-testtools >= 1.4.0 Requires: python-enum34 Requires: python-fasteners >= 0.7 -Requires: python-iso8601 >= 0.1.9 -Requires: python-oslo.config >= 3.7.0 +Requires: python-iso8601 >= 0.1.11 +Requires: python-oslo.config >= 3.14.0 Requires: python-oslo.i18n >= 2.1.0 -Requires: python-oslo.utils >= 3.5.0 +Requires: python-oslo.utils >= 3.16.0 Requires: python-retrying >= 1.2.3 Requires: python-six >= 1.9.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -Oslo concurrency library has utilities for safely running multi-thread, +The oslo.concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes. %package doc -Summary: Documentation for the Oslo concurrency library -Group: Documentation - +Summary: Documentation for OpenStack concurrency library +Group: Development/Languages/Python +BuildRequires: python-Sphinx BuildRequires: python-oslosphinx >= 2.5.0 -BuildRequires: python-sphinx %description doc -Documentation for the Oslo concurrency library. +The oslo.concurrency library has utilities for safely running multi-thread, +multi-process applications using locking mechanisms and for running +external processes. +This package contains the documentation. %prep -%setup -q -n oslo.concurrency-%{version} +%setup -q -n %{sname}-%{version} %build -%{__python2} setup.py build +%{py2_build} # generate html docs -sphinx-build doc/source html +%{__python2} setup.py build_sphinx # remove the sphinx-build leftovers -rm -rf html/.{doctrees,buildinfo} +rm -rf doc/build/html/.{doctrees,buildinfo} %install -%{__python2} setup.py install --skip-build --root %{buildroot} +%{py2_install} %check -%if "%_lib" == "lib64" -testr init -testr run --parallel -%endif +# Test suite fails on 32 bit platforms +if [ "%_lib" = "lib64" ]; then +%{__python2} setup.py testr +fi %files -%defattr(-,root,root,-) -%doc README.rst ChangeLog LICENSE AUTHORS -%{python2_sitelib}/* +%license LICENSE +%doc README.rst ChangeLog %_bindir/lockutils-wrapper +%{python2_sitelib}/oslo_concurrency +%{python2_sitelib}/*.egg-info %files doc -%doc html +%license LICENSE +%doc doc/build/html %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.vEcZCL/_old 2016-09-30 15:35:38.000000000 +0200 +++ /var/tmp/diff_new_pack.vEcZCL/_new 2016-09-30 15:35:38.000000000 +0200 @@ -1,15 +1,13 @@ <services> + <service mode="disabled" name="renderspec"> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/…</param> + <param name="output-name">python-oslo.concurrency.spec</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-req…</param> + </service> <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> </service> - <service mode="disabled" name="set_version"> - <param name="basename">oslo.concurrency</param> - </service> - <service mode="disabled" name="python_requires"> - </service> <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> - <service name="python_requires" mode="disabled"> - </service> </services> ++++++ oslo.concurrency-3.7.0.tar.gz -> oslo.concurrency-3.14.0.tar.gz ++++++ ++++ 1686 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/AUTHORS new/oslo.concurrency-3.14.0/AUTHORS --- old/oslo.concurrency-3.7.0/AUTHORS 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/AUTHORS 2016-08-18 19:59:40.000000000 +0200 @@ -22,6 +22,7 @@ Davanum Srinivas <davanum(a)gmail.com> Davanum Srinivas <dims(a)linux.vnet.ibm.com> David Ripton <dripton(a)redhat.com> +Denis Buliga <dbuliga(a)cloudbasesolutions.com> Dina Belova <dbelova(a)mirantis.com> Dirk Mueller <dirk(a)dmllr.de> Doug Hellmann <doug.hellmann(a)dreamhost.com> @@ -43,7 +44,9 @@ Johannes Erdfelt <johannes.erdfelt(a)rackspace.com> Joshua Harlow <harlowja(a)gmail.com> Joshua Harlow <harlowja(a)yahoo-inc.com> +Joshua Harlow <jxharlow(a)godaddy.com> Julien Danjou <julien(a)danjou.info> +Kirill Bespalov <kbespalov(a)mirantis.com> Mark McLoughlin <markmc(a)redhat.com> Matt Riedemann <mriedem(a)us.ibm.com> Matthew Treinish <treinish(a)linux.vnet.ibm.com> @@ -57,6 +60,7 @@ Russell Bryant <rbryant(a)redhat.com> Salvatore Orlando <salv.orlando(a)gmail.com> Sean Dague <sean(a)dague.net> +Sean M. Collins <sean(a)coreitpro.com> Sergey Kraynev <skraynev(a)mirantis.com> Sergey Lukjanov <slukjanov(a)mirantis.com> Shawn Boyette <shawn.boyette(a)dreamhost.com> @@ -74,3 +78,5 @@ Zhongyue Luo <zhongyue.nah(a)intel.com> jichenjc <jichenjc(a)cn.ibm.com> vponomaryov <vponomaryov(a)mirantis.com> +yanheven <yanheven(a)qq.com> +zhangsong <zhangsong(a)cmss.chinamobile.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/ChangeLog new/oslo.concurrency-3.14.0/ChangeLog --- old/oslo.concurrency-3.7.0/ChangeLog 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/ChangeLog 2016-08-18 19:59:40.000000000 +0200 @@ -1,11 +1,61 @@ CHANGES ======= -3.7.0 +3.14.0 +------ + +* Updated from global requirements +* Fix external lock tests on Windows + +3.13.0 +------ + +* Updated from global requirements +* Fix parameters of assertEqual are misplaced +* Add Python 3.5 classifier and venv + +3.12.0 +------ + +* Updated from global requirements +* Imported Translations from Zanata +* Updated from global requirements + +3.11.0 +------ + +* Imported Translations from Zanata + +3.10.0 +------ + +* Imported Translations from Zanata +* Updated from global requirements +* Add reno for releasenotes management + +3.9.0 ----- +* Add doc/ to pep8 check +* Remove unused import statement +* Add timeout option to ssh_execute +* Fix wrong import example in docstring +* Trivial: ignore openstack/common in flake8 exclude list + +3.8.0 +----- + +* Updated from global requirements +* Imported Translations from Zanata +* processutils: add support for missing process limits +* Remove direct dependency on babel +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* Add a few usage examples for lockutils +* Revert "Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not set" * Updated from global requirements -* Update .gitreview for stable/mitaka +* Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not set 3.6.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/PKG-INFO new/oslo.concurrency-3.14.0/PKG-INFO --- old/oslo.concurrency-3.7.0/PKG-INFO 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/PKG-INFO 2016-08-18 19:59:41.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.concurrency -Version: 3.7.0 +Version: 3.14.0 Summary: Oslo Concurrency library Home-page: http://launchpad.net/oslo Author: OpenStack @@ -39,3 +39,4 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/doc/source/conf.py new/oslo.concurrency-3.14.0/doc/source/conf.py --- old/oslo.concurrency-3.7.0/doc/source/conf.py 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/doc/source/conf.py 2016-08-18 19:57:20.000000000 +0200 @@ -14,8 +14,7 @@ import os import sys -import fileinput -import fnmatch + sys.path.insert(0, os.path.abspath('../..')) # -- General configuration ---------------------------------------------------- @@ -78,4 +77,4 @@ ] # Example configuration for intersphinx: refer to the Python standard library. -#intersphinx_mapping = {'http://docs.python.org/': None} +# intersphinx_mapping = {'http://docs.python.org/': None} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/doc/source/usage.rst new/oslo.concurrency-3.14.0/doc/source/usage.rst --- old/oslo.concurrency-3.7.0/doc/source/usage.rst 2016-03-28 05:04:39.000000000 +0200 +++ new/oslo.concurrency-3.14.0/doc/source/usage.rst 2016-08-18 19:57:20.000000000 +0200 @@ -6,11 +6,62 @@ example:: from oslo_concurrency import lockutils + from oslo_concurrency import processutils .. seealso:: * :doc:`API Documentation <api/index>` +Locking a function (local to a process) +======================================= + +To ensure that a function (which is not thread safe) is only used in +a thread safe manner (typically such type of function should be refactored +to avoid this problem but if not then the following can help):: + + @lockutils.synchronized('not_thread_safe') + def not_thread_safe(): + pass + +Once decorated later callers of this function will be able to call into +this method and the contract that two threads will **not** enter this +function at the same time will be upheld. Make sure that the names of the +locks used are carefully chosen (typically by namespacing them to your +app so that other apps will not chose the same names). + +Locking a function (local to a process as well as across process) +================================================================= + +To ensure that a function (which is not thread safe **or** multi-process +safe) is only used in a safe manner (typically such type of function should +be refactored to avoid this problem but if not then the following can help):: + + @lockutils.synchronized('not_thread_process_safe', external=True) + def not_thread_process_safe(): + pass + +Once decorated later callers of this function will be able to call into +this method and the contract that two threads (or any two processes) +will **not** enter this function at the same time will be upheld. Make +sure that the names of the locks used are carefully chosen (typically by +namespacing them to your app so that other apps will not chose the same +names). + +Common ways to prefix/namespace the synchronized decorator +========================================================== + +Since it is **highly** recommended to prefix (or namespace) the usage +of the synchronized there are a few helpers that can make this much easier +to achieve. + +An example is:: + + myapp_synchronized = lockutils.synchronized_with_prefix("myapp") + +Then further usage of the ``lockutils.synchronized`` would instead now use +this decorator created above instead of using ``lockutils.synchronized`` +directly. + Command Line Wrapper ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/PKG-INFO new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/PKG-INFO --- old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/PKG-INFO 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/PKG-INFO 2016-08-18 19:59:40.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.concurrency -Version: 3.7.0 +Version: 3.14.0 Summary: Oslo Concurrency library Home-page: http://launchpad.net/oslo Author: OpenStack @@ -39,3 +39,4 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/SOURCES.txt new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/SOURCES.txt --- old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/SOURCES.txt 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/SOURCES.txt 2016-08-18 19:59:41.000000000 +0200 @@ -40,11 +40,12 @@ oslo_concurrency/opts.py oslo_concurrency/prlimit.py oslo_concurrency/processutils.py +oslo_concurrency/version.py oslo_concurrency/watchdog.py oslo_concurrency/fixture/__init__.py oslo_concurrency/fixture/lockutils.py -oslo_concurrency/locale/oslo_concurrency-log-info.pot -oslo_concurrency/locale/oslo_concurrency.pot +oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency-log-info.po +oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency.po oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency-log-info.po oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency.po oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency-log-info.po @@ -55,4 +56,11 @@ oslo_concurrency/tests/unit/__init__.py oslo_concurrency/tests/unit/test_lockutils.py oslo_concurrency/tests/unit/test_lockutils_eventlet.py -oslo_concurrency/tests/unit/test_processutils.py \ No newline at end of file +oslo_concurrency/tests/unit/test_processutils.py +releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml +releasenotes/source/conf.py +releasenotes/source/index.rst +releasenotes/source/unreleased.rst +releasenotes/source/_static/.placeholder +releasenotes/source/_templates/.placeholder +releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/pbr.json new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/pbr.json --- old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/pbr.json 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/pbr.json 2016-08-18 19:59:40.000000000 +0200 @@ -1 +1 @@ -{"git_version": "75c5ba3", "is_release": true} \ No newline at end of file +{"git_version": "ebd3921", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/requires.txt new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/requires.txt --- old/oslo.concurrency-3.7.0/oslo.concurrency.egg-info/requires.txt 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo.concurrency.egg-info/requires.txt 2016-08-18 19:59:40.000000000 +0200 @@ -1,12 +1,9 @@ pbr>=1.6 -Babel>=1.3 -iso8601>=0.1.9 -oslo.config>=3.7.0 +enum34 +iso8601>=0.1.11 +oslo.config>=3.14.0 oslo.i18n>=2.1.0 -oslo.utils>=3.5.0 +oslo.utils>=3.16.0 six>=1.9.0 fasteners>=0.7 retrying!=1.3.0,>=1.2.3 - -[:(python_version=='2.7' or python_version=='2.6' or python_version=='3.3')] -enum34 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency-log-info.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency-log-info.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency-log-info.po 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency-log-info.po 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,19 @@ +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata +msgid "" +msgstr "" +"Project-Id-Version: oslo.concurrency 3.9.1.dev2\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-06-04 05:27+0000\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2016-06-02 07:05+0000\n" +"Last-Translator: Andreas Jaeger <jaegerandi(a)gmail.com>\n" +"Language-Team: German\n" +"Language: de\n" +"X-Generator: Zanata 3.7.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#, python-format +msgid "Failed to remove file %(file)s" +msgstr "Fehler beim Entfernen der Datei %(file)s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency.po 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/de/LC_MESSAGES/oslo_concurrency.po 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,101 @@ +# Translations template for oslo.concurrency. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the oslo.concurrency +# project. +# +# Translators: +# Christian Berendt <berendt(a)b1-systems.de>, 2014 +# Ettore Atalan <atalanttore(a)googlemail.com>, 2014 +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata +msgid "" +msgstr "" +"Project-Id-Version: oslo.concurrency 3.9.1.dev3\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-06-07 17:48+0000\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2016-06-08 06:36+0000\n" +"Last-Translator: Andreas Jaeger <jaegerandi(a)gmail.com>\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.3\n" +"Language-Team: German\n" + +#, python-format +msgid "" +"%(desc)r\n" +"command: %(cmd)r\n" +"exit code: %(code)r\n" +"stdout: %(stdout)r\n" +"stderr: %(stderr)r" +msgstr "" +"%(desc)r\n" +"Kommando: %(cmd)r\n" +"Abschlusscode: %(code)r\n" +"Stdout: %(stdout)r\n" +"Stderr: %(stderr)r" + +#, python-format +msgid "" +"%(description)s\n" +"Command: %(cmd)s\n" +"Exit code: %(exit_code)s\n" +"Stdout: %(stdout)r\n" +"Stderr: %(stderr)r" +msgstr "" +"%(description)s\n" +"Befehl: %(cmd)s.\n" +"Beendigungscode: %(exit_code)s.\n" +"Standardausgabe: %(stdout)r\n" +"Standardfehler: %(stderr)r" + +#, python-format +msgid "%r failed. Not Retrying." +msgstr "%r fehlgeschlagen. Wird nicht wiederholt." + +#, python-format +msgid "%r failed. Retrying." +msgstr "%r fehlgeschlagen. Neuversuch." + +msgid "" +"Calling lockutils directly is no longer supported. Please use the lockutils-" +"wrapper console script instead." +msgstr "" +"Ein direkter Aufruf von lockutils wird nicht mehr unterstützt. Verwenden Sie " +"stattdessen das lockutils-wrapper Konsolescript." + +msgid "Command requested root, but did not specify a root helper." +msgstr "Kommando braucht root, es wurde aber kein root helper spezifiziert." + +msgid "Environment not supported over SSH" +msgstr "Umgebung wird nicht über SSH unterstützt" + +#, python-format +msgid "" +"Got an OSError\n" +"command: %(cmd)r\n" +"errno: %(errno)r" +msgstr "" +"OS Fehler aufgetreten:\n" +"Kommando: %(cmd)r\n" +"Fehlernummer: %(errno)r" + +#, python-format +msgid "Got invalid arg log_errors: %r" +msgstr "Ungültiges Argument für log_errors: %r" + +#, python-format +msgid "Got unknown keyword args: %r" +msgstr "Ungültige Schlüsswelwortargumente: %r" + +#, python-format +msgid "Running cmd (subprocess): %s" +msgstr "Führe Kommando (subprocess) aus: %s" + +msgid "Unexpected error while running command." +msgstr "Unerwarteter Fehler bei der Ausführung des Kommandos." + +msgid "process_input not supported over SSH" +msgstr "process_input wird nicht über SSH unterstützt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency-log-info.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency-log-info.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency-log-info.po 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency-log-info.po 2016-08-18 19:57:20.000000000 +0200 @@ -5,12 +5,12 @@ # # Translators: # Andi Chandler <andi(a)gowling.com>, 2014 -# OpenStack Infra <zanata(a)openstack.org>, 2015. #zanata +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 3.2.1.dev3\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-13 08:54+0000\n" +"Project-Id-Version: oslo.concurrency 3.6.1.dev10\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-04-19 12:20+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency.po 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/en_GB/LC_MESSAGES/oslo_concurrency.po 2016-08-18 19:57:20.000000000 +0200 @@ -5,12 +5,12 @@ # # Translators: # Andi Chandler <andi(a)gowling.com>, 2014-2015 -# OpenStack Infra <zanata(a)openstack.org>, 2015. #zanata +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 3.2.1.dev3\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-13 08:54+0000\n" +"Project-Id-Version: oslo.concurrency 3.6.1.dev10\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-04-19 12:20+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency-log-info.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency-log-info.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency-log-info.po 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency-log-info.po 2016-08-18 19:57:20.000000000 +0200 @@ -5,12 +5,12 @@ # # Translators: # Adriana Chisco Landazábal <achisco94(a)gmail.com>, 2015 -# OpenStack Infra <zanata(a)openstack.org>, 2015. #zanata +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 3.2.1.dev3\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-13 08:54+0000\n" +"Project-Id-Version: oslo.concurrency 3.6.1.dev10\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-04-19 12:20+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency.po 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/es/LC_MESSAGES/oslo_concurrency.po 2016-08-18 19:57:20.000000000 +0200 @@ -5,12 +5,12 @@ # # Translators: # Adriana Chisco Landazábal <achisco94(a)gmail.com>, 2015 -# OpenStack Infra <zanata(a)openstack.org>, 2015. #zanata +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 3.2.1.dev3\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-13 08:54+0000\n" +"Project-Id-Version: oslo.concurrency 3.6.1.dev10\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-04-19 12:20+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency-log-info.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency-log-info.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency-log-info.po 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency-log-info.po 2016-08-18 19:57:20.000000000 +0200 @@ -5,12 +5,12 @@ # # Translators: # Maxime COQUEREL <max.coquerel(a)gmail.com>, 2015 -# OpenStack Infra <zanata(a)openstack.org>, 2015. #zanata +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 3.2.1.dev3\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-13 08:54+0000\n" +"Project-Id-Version: oslo.concurrency 3.6.1.dev10\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-04-19 12:20+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency.po new/oslo.concurrency-3.14.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency.po --- old/oslo.concurrency-3.7.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency.po 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/locale/fr/LC_MESSAGES/oslo_concurrency.po 2016-08-18 19:57:20.000000000 +0200 @@ -5,12 +5,12 @@ # # Translators: # Maxime COQUEREL <max.coquerel(a)gmail.com>, 2015 -# OpenStack Infra <zanata(a)openstack.org>, 2015. #zanata +# Andreas Jaeger <jaegerandi(a)gmail.com>, 2016. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 3.2.1.dev3\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-13 08:54+0000\n" +"Project-Id-Version: oslo.concurrency 3.6.1.dev10\n" +"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" +"POT-Creation-Date: 2016-04-19 12:20+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/lockutils.py new/oslo.concurrency-3.14.0/oslo_concurrency/lockutils.py --- old/oslo.concurrency-3.7.0/oslo_concurrency/lockutils.py 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/lockutils.py 2016-08-18 19:57:20.000000000 +0200 @@ -291,7 +291,7 @@ Redefine @synchronized in each project like so:: (in nova/utils.py) - from nova.openstack.common import lockutils + from oslo_concurrency import lockutils synchronized = lockutils.synchronized_with_prefix('nova-') @@ -316,7 +316,7 @@ Redefine remove_external_lock_file_with_prefix in each project like so:: (in nova/utils.py) - from nova.openstack.common import lockutils + from oslo_concurrency import lockutils synchronized = lockutils.synchronized_with_prefix('nova-') synchronized_remove = lockutils.remove_external_lock_file_with_prefix( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/prlimit.py new/oslo.concurrency-3.14.0/oslo_concurrency/prlimit.py --- old/oslo.concurrency-3.7.0/oslo_concurrency/prlimit.py 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/prlimit.py 2016-08-18 19:57:20.000000000 +0200 @@ -26,8 +26,15 @@ RESOURCES = ( # argparse argument => resource ('as', resource.RLIMIT_AS), + ('core', resource.RLIMIT_CORE), + ('cpu', resource.RLIMIT_CPU), + ('data', resource.RLIMIT_DATA), + ('fsize', resource.RLIMIT_FSIZE), + ('memlock', resource.RLIMIT_MEMLOCK), ('nofile', resource.RLIMIT_NOFILE), + ('nproc', resource.RLIMIT_NPROC), ('rss', resource.RLIMIT_RSS), + ('stack', resource.RLIMIT_STACK), ) @@ -35,10 +42,24 @@ parser = argparse.ArgumentParser(description='prlimit', prog=USAGE_PROGRAM) parser.add_argument('--as', type=int, help='Address space limit in bytes') + parser.add_argument('--core', type=int, + help='Core file size limit in bytes') + parser.add_argument('--cpu', type=int, + help='CPU time limit in seconds') + parser.add_argument('--data', type=int, + help='Data size limit in bytes') + parser.add_argument('--fsize', type=int, + help='File size limit in bytes') + parser.add_argument('--memlock', type=int, + help='Locked memory limit in bytes') parser.add_argument('--nofile', type=int, help='Maximum number of open files') + parser.add_argument('--nproc', type=int, + help='Maximum number of processes') parser.add_argument('--rss', type=int, help='Maximum Resident Set Size (RSS) in bytes') + parser.add_argument('--stack', type=int, + help='Stack size limit in bytes') parser.add_argument('program', help='Program (absolute path)') parser.add_argument('program_args', metavar="arg", nargs='...', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/processutils.py new/oslo.concurrency-3.14.0/oslo_concurrency/processutils.py --- old/oslo.concurrency-3.7.0/oslo_concurrency/processutils.py 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/processutils.py 2016-08-18 19:57:20.000000000 +0200 @@ -134,16 +134,36 @@ Attributes: * address_space: Address space limit in bytes - * number_files: Maximum number of open files. + * core_file_size: Core file size limit in bytes + * cpu_time: CPU time limit in seconds + * data_size: Data size limit in bytes + * file_size: File size limit in bytes + * memory_locked: Locked memory limit in bytes + * number_files: Maximum number of open files + * number_processes: Maximum number of processes * resident_set_size: Maximum Resident Set Size (RSS) in bytes + * stack_size: Stack size limit in bytes This object can be used for the *prlimit* parameter of :func:`execute`. """ + _LIMITS = { + "address_space": "--as", + "core_file_size": "--core", + "cpu_time": "--cpu", + "data_size": "--data", + "file_size": "--fsize", + "memory_locked": "--memlock", + "number_files": "--nofile", + "number_processes": "--nproc", + "resident_set_size": "--rss", + "stack_size": "--stack", + } + def __init__(self, **kw): - self.address_space = kw.pop('address_space', None) - self.number_files = kw.pop('number_files', None) - self.resident_set_size = kw.pop('resident_set_size', None) + for limit in self._LIMITS.keys(): + setattr(self, limit, kw.pop(limit, None)) + if kw: raise ValueError("invalid limits: %s" % ', '.join(sorted(kw.keys()))) @@ -151,12 +171,10 @@ def prlimit_args(self): """Create a list of arguments for the prlimit command line.""" args = [] - if self.address_space: - args.append('--as=%s' % self.address_space) - if self.number_files: - args.append('--nofile=%s' % self.number_files) - if self.resident_set_size: - args.append('--rss=%s' % self.resident_set_size) + for limit in self._LIMITS.keys(): + val = getattr(self, limit) + if val is not None: + args.append("%s=%s" % (self._LIMITS[limit], val)) return args @@ -448,7 +466,7 @@ def ssh_execute(ssh, cmd, process_input=None, addl_env=None, check_exit_code=True, - binary=False): + binary=False, timeout=None): """Run a command through SSH. .. versionchanged:: 1.9 @@ -463,7 +481,8 @@ # This is (probably) fixable if we need it... raise InvalidArgumentError(_('process_input not supported over SSH')) - stdin_stream, stdout_stream, stderr_stream = ssh.exec_command(cmd) + stdin_stream, stdout_stream, stderr_stream = ssh.exec_command( + cmd, timeout=timeout) channel = stdout_stream.channel # NOTE(justinsb): This seems suspicious... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/tests/unit/test_lockutils.py new/oslo.concurrency-3.14.0/oslo_concurrency/tests/unit/test_lockutils.py --- old/oslo.concurrency-3.7.0/oslo_concurrency/tests/unit/test_lockutils.py 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/tests/unit/test_lockutils.py 2016-08-18 19:57:21.000000000 +0200 @@ -13,7 +13,7 @@ # under the License. import collections -import fcntl +import multiprocessing import os import shutil import signal @@ -31,6 +31,50 @@ from oslo_concurrency import lockutils from oslo_config import fixture as config +if sys.platform == 'win32': + import msvcrt +else: + import fcntl + + +def lock_file(handle): + if sys.platform == 'win32': + msvcrt.locking(handle.fileno(), msvcrt.LK_NBLCK, 1) + else: + fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB) + + +def unlock_file(handle): + if sys.platform == 'win32': + msvcrt.locking(handle.fileno(), msvcrt.LK_UNLCK, 1) + else: + fcntl.flock(handle, fcntl.LOCK_UN) + + +def lock_files(handles_dir, out_queue): + with lockutils.lock('external', 'test-', external=True): + # Open some files we can use for locking + handles = [] + for n in range(50): + path = os.path.join(handles_dir, ('file-%s' % n)) + handles.append(open(path, 'w')) + + # Loop over all the handles and try locking the file + # without blocking, keep a count of how many files we + # were able to lock and then unlock. If the lock fails + # we get an IOError and bail out with bad exit code + count = 0 + for handle in handles: + try: + lock_file(handle) + count += 1 + unlock_file(handle) + except IOError: + os._exit(2) + finally: + handle.close() + return out_queue.put(count) + class LockTestCase(test_base.BaseTestCase): @@ -44,9 +88,9 @@ """Bar.""" pass - self.assertEqual(foo.__doc__, 'Bar.', "Wrapped function's docstring " + self.assertEqual('Bar.', foo.__doc__, "Wrapped function's docstring " "got lost") - self.assertEqual(foo.__name__, 'foo', "Wrapped function's name " + self.assertEqual('foo', foo.__name__, "Wrapped function's name " "got mangled") def test_lock_internally_different_collections(self): @@ -92,7 +136,7 @@ for thread in threads: thread.join() - self.assertEqual(len(seen_threads), 100) + self.assertEqual(100, len(seen_threads)) # Looking at the seen threads, split it into chunks of 10, and verify # that the last 9 match the first in each chunk. for i in range(10): @@ -126,51 +170,20 @@ def _do_test_lock_externally(self): """We can lock across multiple processes.""" - - def lock_files(handles_dir): - - with lockutils.lock('external', 'test-', external=True): - # Open some files we can use for locking - handles = [] - for n in range(50): - path = os.path.join(handles_dir, ('file-%s' % n)) - handles.append(open(path, 'w')) - - # Loop over all the handles and try locking the file - # without blocking, keep a count of how many files we - # were able to lock and then unlock. If the lock fails - # we get an IOError and bail out with bad exit code - count = 0 - for handle in handles: - try: - fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB) - count += 1 - fcntl.flock(handle, fcntl.LOCK_UN) - except IOError: - os._exit(2) - finally: - handle.close() - - # Check if we were able to open all files - self.assertEqual(50, count) - handles_dir = tempfile.mkdtemp() try: children = [] for n in range(50): - pid = os.fork() - if pid: - children.append(pid) - else: - try: - lock_files(handles_dir) - finally: - os._exit(0) - - for child in children: - (pid, status) = os.waitpid(child, 0) - if pid: - self.assertEqual(0, status) + queue = multiprocessing.Queue() + proc = multiprocessing.Process( + target=lock_files, + args=(handles_dir, queue)) + proc.start() + children.append((proc, queue)) + for child, queue in children: + child.join() + count = queue.get(block=False) + self.assertEqual(50, count) finally: if os.path.exists(handles_dir): shutil.rmtree(handles_dir, ignore_errors=True) @@ -336,7 +349,7 @@ conf = cfg.ConfigOpts() conf(['--config-file', paths[0]]) conf.register_opts(lockutils._opts, 'oslo_concurrency') - self.assertEqual(conf.oslo_concurrency.lock_path, 'foo') + self.assertEqual('foo', conf.oslo_concurrency.lock_path) self.assertTrue(conf.oslo_concurrency.disable_process_locking) @@ -436,7 +449,7 @@ thread1.start() thread1.join() thread.join() - self.assertEqual(call_list, ['other', 'other', 'main', 'main']) + self.assertEqual(['other', 'other', 'main', 'main'], call_list) def test_non_destructive(self): lock_file = os.path.join(self.lock_dir, 'not-destroyed') @@ -445,7 +458,7 @@ with lockutils.lock('not-destroyed', external=True, lock_path=self.lock_dir): with open(lock_file) as f: - self.assertEqual(f.read(), 'test') + self.assertEqual('test', f.read()) class LockutilsModuleTestCase(test_base.BaseTestCase): @@ -470,7 +483,7 @@ ]) argv = ['', sys.executable, '-c', script] retval = lockutils._lock_wrapper(argv) - self.assertEqual(retval, 0, "Bad OSLO_LOCK_PATH has been set") + self.assertEqual(0, retval, "Bad OSLO_LOCK_PATH has been set") def test_return_value_maintained(self): script = '\n'.join([ @@ -479,7 +492,7 @@ ]) argv = ['', sys.executable, '-c', script] retval = lockutils._lock_wrapper(argv) - self.assertEqual(retval, 1) + self.assertEqual(1, retval) def test_direct_call_explodes(self): cmd = [sys.executable, '-m', 'oslo_concurrency.lockutils'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/tests/unit/test_processutils.py new/oslo.concurrency-3.14.0/oslo_concurrency/tests/unit/test_processutils.py --- old/oslo.concurrency-3.7.0/oslo_concurrency/tests/unit/test_processutils.py 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/tests/unit/test_processutils.py 2016-08-18 19:57:20.000000000 +0200 @@ -21,6 +21,7 @@ import os import pickle import resource +import socket import stat import subprocess import sys @@ -206,11 +207,12 @@ fp = open(tmpfilename2, 'r') runs = fp.read() fp.close() - self.assertNotEqual(runs.strip(), 'failure', 'stdin did not ' - 'always get passed ' - 'correctly') + self.assertNotEqual('failure', 'stdin did not ' + 'always get passed ' + 'correctly', + runs.strip()) runs = int(runs.strip()) - self.assertEqual(runs, 10, 'Ran %d times instead of 10.' % (runs,)) + self.assertEqual(10, runs, 'Ran %d times instead of 10.' % (runs,)) finally: os.unlink(tmpfilename) os.unlink(tmpfilename2) @@ -397,9 +399,10 @@ self.assertIsInstance(err.stderr, six.text_type) self.assertIn('onstdout --password="***"', err.stdout) self.assertIn('onstderr --password="***"', err.stderr) - self.assertEqual(err.cmd, ' '.join([tmpfilename, - 'password="***"', - 'something'])) + self.assertEqual(' '.join([tmpfilename, + 'password="***"', + 'something']), + err.cmd) self.assertNotIn('secret', str(err)) def execute_undecodable_bytes(self, out_bytes, err_bytes, @@ -427,8 +430,8 @@ out, err = self.execute_undecodable_bytes(out_bytes, err_bytes, binary=binary) if six.PY3 and not binary: - self.assertEqual(out, os.fsdecode(out_bytes)) - self.assertEqual(err, os.fsdecode(err_bytes)) + self.assertEqual(os.fsdecode(out_bytes), out) + self.assertEqual(os.fsdecode(err_bytes), err) else: self.assertEqual(out, out_bytes) self.assertEqual(err, err_bytes) @@ -454,13 +457,13 @@ if six.PY3: # On Python 3, stdout and stderr attributes of # ProcessExecutionError must always be Unicode - self.assertEqual(out, os.fsdecode(out_bytes)) - self.assertEqual(err, os.fsdecode(err_bytes)) + self.assertEqual(os.fsdecode(out_bytes), out) + self.assertEqual(os.fsdecode(err_bytes), err) else: # On Python 2, stdout and stderr attributes of # ProcessExecutionError must always be bytes - self.assertEqual(out, out_bytes) - self.assertEqual(err, err_bytes) + self.assertEqual(out_bytes, out) + self.assertEqual(err_bytes, err) def test_undecodable_bytes_error(self): self.check_undecodable_bytes_error(False) @@ -481,7 +484,7 @@ self.assertEqual(42, exc.exit_code) self.assertEqual('my cmd', exc.cmd) self.assertEqual('my description', exc.description) - self.assertEqual(exc_message, str(exc)) + self.assertEqual(str(exc), exc_message) class ProcessExecutionErrorLoggingTest(test_base.BaseTestCase): @@ -599,7 +602,9 @@ self.out = out self.err = err - def exec_command(self, cmd): + def exec_command(self, cmd, timeout=None): + if timeout: + raise socket.timeout() stdout = FakeSshStream(self.out) stdout.setup_channel(self.rc) return (six.BytesIO(), @@ -618,6 +623,12 @@ processutils.ssh_execute, None, 'ls', process_input='important') + def test_timeout_error(self): + self.assertRaises(socket.timeout, + processutils.ssh_execute, + FakeSshConnection(0), 'ls', + timeout=10) + def test_works(self): out, err = processutils.ssh_execute(FakeSshConnection(0), 'ls') self.assertEqual('stdout', out) @@ -640,11 +651,11 @@ out, err = processutils.ssh_execute(conn, 'ls', binary=binary) if six.PY3 and not binary: - self.assertEqual(out, os.fsdecode(out_bytes)) - self.assertEqual(err, os.fsdecode(err_bytes)) + self.assertEqual(os.fsdecode(out_bytes), out) + self.assertEqual(os.fsdecode(err_bytes), err) else: - self.assertEqual(out, out_bytes) - self.assertEqual(err, err_bytes) + self.assertEqual(out_bytes, out) + self.assertEqual(err_bytes, err) def test_undecodable_bytes(self): self.check_undecodable_bytes(False) @@ -670,13 +681,13 @@ if six.PY3: # On Python 3, stdout and stderr attributes of # ProcessExecutionError must always be Unicode - self.assertEqual(out, os.fsdecode(out_bytes)) - self.assertEqual(err, os.fsdecode(err_bytes)) + self.assertEqual(os.fsdecode(out_bytes), out) + self.assertEqual(os.fsdecode(err_bytes), err) else: # On Python 2, stdout and stderr attributes of # ProcessExecutionError must always be bytes - self.assertEqual(out, out_bytes) - self.assertEqual(err, err_bytes) + self.assertEqual(out_bytes, out) + self.assertEqual(err_bytes, err) def test_undecodable_bytes_error(self): self.check_undecodable_bytes_error(False) @@ -711,9 +722,9 @@ check_exit_code=check) self.assertEqual(rc, err.exit_code) - self.assertEqual(err.stdout, 'password="***"') - self.assertEqual(err.stderr, 'password="***"') - self.assertEqual(err.cmd, 'ls --password="***"') + self.assertEqual('password="***"', err.stdout) + self.assertEqual('password="***"', err.stderr) + self.assertEqual('ls --password="***"', err.cmd) self.assertNotIn('secret', str(err)) self.assertNotIn('foobar', str(err)) else: @@ -752,7 +763,7 @@ # Create a new soft limit for a resource, lower than the current # soft limit. soft_limit, hard_limit = resource.getrlimit(res) - if soft_limit < 0: + if soft_limit <= 0: soft_limit = default_limit else: soft_limit -= substract @@ -775,7 +786,7 @@ prlimit = self.limit_address_space() stdout, stderr = processutils.execute(*self.SIMPLE_PROGRAM, prlimit=prlimit) - self.assertEqual(stdout.rstrip(), '') + self.assertEqual('', stdout.rstrip()) self.assertEqual(stderr.rstrip(), '') def check_limit(self, prlimit, resource, value): @@ -784,12 +795,37 @@ args = [sys.executable, '-c', code] stdout, stderr = processutils.execute(*args, prlimit=prlimit) expected = (value, value) - self.assertEqual(stdout.rstrip(), str(expected)) + self.assertEqual(str(expected), stdout.rstrip()) def test_address_space(self): prlimit = self.limit_address_space() self.check_limit(prlimit, 'RLIMIT_AS', prlimit.address_space) + def test_core_size(self): + size = self.soft_limit(resource.RLIMIT_CORE, 1, 1024) + prlimit = processutils.ProcessLimits(core_file_size=size) + self.check_limit(prlimit, 'RLIMIT_CORE', prlimit.core_file_size) + + def test_cpu_time(self): + time = self.soft_limit(resource.RLIMIT_CPU, 1, 1024) + prlimit = processutils.ProcessLimits(cpu_time=time) + self.check_limit(prlimit, 'RLIMIT_CPU', prlimit.cpu_time) + + def test_data_size(self): + max_memory = self.memory_limit(resource.RLIMIT_DATA) + prlimit = processutils.ProcessLimits(data_size=max_memory) + self.check_limit(prlimit, 'RLIMIT_DATA', max_memory) + + def test_file_size(self): + size = self.soft_limit(resource.RLIMIT_FSIZE, 1, 1024) + prlimit = processutils.ProcessLimits(file_size=size) + self.check_limit(prlimit, 'RLIMIT_FSIZE', prlimit.file_size) + + def test_memory_locked(self): + max_memory = self.memory_limit(resource.RLIMIT_MEMLOCK) + prlimit = processutils.ProcessLimits(memory_locked=max_memory) + self.check_limit(prlimit, 'RLIMIT_MEMLOCK', max_memory) + def test_resident_set_size(self): max_memory = self.memory_limit(resource.RLIMIT_RSS) prlimit = processutils.ProcessLimits(resident_set_size=max_memory) @@ -800,6 +836,16 @@ prlimit = processutils.ProcessLimits(number_files=nfiles) self.check_limit(prlimit, 'RLIMIT_NOFILE', nfiles) + def test_number_processes(self): + nprocs = self.soft_limit(resource.RLIMIT_NPROC, 1, 65535) + prlimit = processutils.ProcessLimits(number_processes=nprocs) + self.check_limit(prlimit, 'RLIMIT_NPROC', nprocs) + + def test_stack_size(self): + max_memory = self.memory_limit(resource.RLIMIT_STACK) + prlimit = processutils.ProcessLimits(stack_size=max_memory) + self.check_limit(prlimit, 'RLIMIT_STACK', max_memory) + def test_unsupported_prlimit(self): self.assertRaises(ValueError, processutils.ProcessLimits, xxx=33) @@ -818,8 +864,8 @@ try: processutils.execute(*args, prlimit=prlimit) except processutils.ProcessExecutionError as exc: - self.assertEqual(exc.exit_code, 1) - self.assertEqual(exc.stdout, '') + self.assertEqual(1, exc.exit_code) + self.assertEqual('', exc.stdout) expected = ('%s -m oslo_concurrency.prlimit: ' 'failed to execute /missing_path/dont_exist/program: ' % os.path.basename(sys.executable)) @@ -841,8 +887,8 @@ try: processutils.execute(*args, prlimit=prlimit) except processutils.ProcessExecutionError as exc: - self.assertEqual(exc.exit_code, 1) - self.assertEqual(exc.stdout, '') + self.assertEqual(1, exc.exit_code) + self.assertEqual('', exc.stdout) expected = ('%s -m oslo_concurrency.prlimit: ' 'failed to set the AS resource limit: ' % os.path.basename(sys.executable)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/oslo_concurrency/version.py new/oslo.concurrency-3.14.0/oslo_concurrency/version.py --- old/oslo.concurrency-3.7.0/oslo_concurrency/version.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/oslo_concurrency/version.py 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,18 @@ +# Copyright 2016 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +import pbr.version + +version_info = pbr.version.VersionInfo('oslo_concurrency') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml new/oslo.concurrency-3.14.0/releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml --- old/oslo.concurrency-3.7.0/releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,3 @@ +--- +other: + - Switch to reno for managing release notes. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/releasenotes/source/conf.py new/oslo.concurrency-3.14.0/releasenotes/source/conf.py --- old/oslo.concurrency-3.7.0/releasenotes/source/conf.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/releasenotes/source/conf.py 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,273 @@ +# -*- coding: utf-8 -*- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is execfile()d with the current directory set to its +# containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +# sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ------------------------------------------------ + +# If your documentation needs a minimal Sphinx version, state it here. +# needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ + 'oslosphinx', + 'reno.sphinxext', +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +# source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'oslo.concurrency Release Notes' +copyright = u'2016, oslo.concurrency Developers' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +from oslo_concurrency.version import version_info as oslo_concurrency_version +# The full version, including alpha/beta/rc tags. +release = oslo_concurrency_version.version_string_with_vcs() +# The short X.Y version. +version = oslo_concurrency_version.canonical_version_string() + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +# today = '' +# Else, today_fmt is used as the format for a strftime call. +# today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = [] + +# The reST default role (used for this markup: `text`) to use for all +# documents. +# default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +# add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +# add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +# show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +# modindex_common_prefix = [] + +# If true, keep warnings as "system message" paragraphs in the built documents. +# keep_warnings = False + + +# -- Options for HTML output ---------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +# html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +# html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# "<project> v<release> documentation". +# html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +# html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +# html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +# html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# Add any extra paths that contain custom files (such as robots.txt or +# .htaccess) here, relative to this directory. These files are copied +# directly to the root of the documentation. +# html_extra_path = [] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +# html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +# html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +# html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +# html_additional_pages = {} + +# If false, no module index is generated. +# html_domain_indices = True + +# If false, no index is generated. +# html_use_index = True + +# If true, the index is split into individual pages for each letter. +# html_split_index = False + +# If true, links to the reST sources are added to the pages. +# html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +# html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +# html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a <link> tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +# html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +# html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'oslo.concurrencyReleaseNotesDoc' + + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # 'papersize': 'letterpaper', + + # The font size ('10pt', '11pt' or '12pt'). + # 'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + # 'preamble': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_documents = [ + ('index', 'oslo.concurrencyReleaseNotes.tex', + u'oslo.concurrency Release Notes Documentation', + u'oslo.concurrency Developers', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +# latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +# latex_use_parts = False + +# If true, show page references after internal links. +# latex_show_pagerefs = False + +# If true, show URL addresses after external links. +# latex_show_urls = False + +# Documents to append as an appendix to all manuals. +# latex_appendices = [] + +# If false, no module index is generated. +# latex_domain_indices = True + + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'oslo.concurrencyReleaseNotes', + u'oslo.concurrency Release Notes Documentation', + [u'oslo.concurrency Developers'], 1) +] + +# If true, show URL addresses after external links. +# man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ('index', 'oslo.concurrencyReleaseNotes', + u'oslo.concurrency Release Notes Documentation', + u'oslo.concurrency Developers', 'oslo.concurrencyReleaseNotes', + 'One line description of project.', + 'Miscellaneous'), +] + +# Documents to append as an appendix to all manuals. +# texinfo_appendices = [] + +# If false, no module index is generated. +# texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +# texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +# texinfo_no_detailmenu = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/releasenotes/source/index.rst new/oslo.concurrency-3.14.0/releasenotes/source/index.rst --- old/oslo.concurrency-3.7.0/releasenotes/source/index.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/releasenotes/source/index.rst 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,8 @@ +=============================== + oslo.concurrency Release Notes +=============================== + + .. toctree:: + :maxdepth: 1 + + unreleased diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po new/oslo.concurrency-3.14.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po --- old/oslo.concurrency-3.7.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,30 @@ +# Andi Chandler <andi(a)gowling.com>, 2016. #zanata +msgid "" +msgstr "" +"Project-Id-Version: oslo.concurrency Release Notes 3.11.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-01 03:44+0000\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2016-06-28 05:54+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" +"Language-Team: English (United Kingdom)\n" +"Language: en-GB\n" +"X-Generator: Zanata 3.7.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +msgid "3.10.0" +msgstr "3.10.0" + +msgid "Other Notes" +msgstr "Other Notes" + +msgid "Switch to reno for managing release notes." +msgstr "Switch to reno for managing release notes." + +msgid "Unreleased Release Notes" +msgstr "Unreleased Release Notes" + +msgid "oslo.concurrency Release Notes" +msgstr "oslo.concurrency Release Notes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/releasenotes/source/unreleased.rst new/oslo.concurrency-3.14.0/releasenotes/source/unreleased.rst --- old/oslo.concurrency-3.7.0/releasenotes/source/unreleased.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.concurrency-3.14.0/releasenotes/source/unreleased.rst 2016-08-18 19:57:20.000000000 +0200 @@ -0,0 +1,5 @@ +========================== + Unreleased Release Notes +========================== + +.. release-notes:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/requirements.txt new/oslo.concurrency-3.14.0/requirements.txt --- old/oslo.concurrency-3.7.0/requirements.txt 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/requirements.txt 2016-08-18 19:57:21.000000000 +0200 @@ -3,12 +3,11 @@ # process, which may cause wedges in the gate later. pbr>=1.6 # Apache-2.0 -Babel>=1.3 # BSD enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -iso8601>=0.1.9 # MIT -oslo.config>=3.7.0 # Apache-2.0 +iso8601>=0.1.11 # MIT +oslo.config>=3.14.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 -oslo.utils>=3.5.0 # Apache-2.0 +oslo.utils>=3.16.0 # Apache-2.0 six>=1.9.0 # MIT fasteners>=0.7 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/setup.cfg new/oslo.concurrency-3.14.0/setup.cfg --- old/oslo.concurrency-3.7.0/setup.cfg 2016-03-28 05:06:57.000000000 +0200 +++ new/oslo.concurrency-3.14.0/setup.cfg 2016-08-18 19:59:41.000000000 +0200 @@ -17,6 +17,7 @@ Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.5 [files] packages = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/test-requirements.txt new/oslo.concurrency-3.14.0/test-requirements.txt --- old/oslo.concurrency-3.7.0/test-requirements.txt 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/test-requirements.txt 2016-08-18 19:57:20.000000000 +0200 @@ -6,10 +6,11 @@ oslotest>=1.10.0 # Apache-2.0 coverage>=3.6 # Apache-2.0 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD -fixtures>=1.3.1 # Apache-2.0/BSD +fixtures>=3.0.0 # Apache-2.0/BSD # These are needed for docs generation oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +reno>=1.8.0 # Apache2 eventlet!=0.18.3,>=0.18.2 # MIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.concurrency-3.7.0/tox.ini new/oslo.concurrency-3.14.0/tox.ini --- old/oslo.concurrency-3.7.0/tox.ini 2016-03-28 05:04:37.000000000 +0200 +++ new/oslo.concurrency-3.14.0/tox.ini 2016-08-18 19:57:20.000000000 +0200 @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py34,py27,pep8 +envlist = py35,py34,py27,pep8 [testenv] deps = -r{toxinidir}/test-requirements.txt @@ -9,10 +9,6 @@ lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' env TEST_EVENTLET=1 lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' -[testenv:py34] -commands = - lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' - [testenv:pep8] commands = flake8 @@ -28,7 +24,7 @@ [flake8] show-source = True ignore = H405 -exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build +exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build [hacking] import_exceptions = @@ -41,3 +37,6 @@ # of the requirements.txt files deps = pip_missing_reqs commands = pip-missing-reqs -d --ignore-module=oslo_concurrency* --ignore-file=oslo_concurrency/tests/* --ignore-file=tests/ oslo_concurrency + +[testenv:releasenotes] +commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html

1 0

commit the_silver_searcher for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package the_silver_searcher for openSUSE:Factory checked in at 2016-09-30 15:35:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/the_silver_searcher (Old) and /work/SRC/openSUSE:Factory/.the_silver_searcher.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "the_silver_searcher" Changes: -------- --- /work/SRC/openSUSE:Factory/the_silver_searcher/the_silver_searcher.changes 2016-05-19 12:16:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.the_silver_searcher.new/the_silver_searcher.changes 2016-09-30 15:35:33.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 29 09:55:32 UTC 2016 - astieger(a)suse.com + +- update to 0.33.0: + * Fix --word-regexp not applying to alternates + * The preferred ignore file is .ignore, .agignore is deprecated + +------------------------------------------------------------------- Old: ---- the_silver_searcher-0.32.0.tar.gz the_silver_searcher-0.32.0.tar.gz.asc New: ---- the_silver_searcher-0.33.0.tar.gz the_silver_searcher-0.33.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ the_silver_searcher.spec ++++++ --- /var/tmp/diff_new_pack.nltduY/_old 2016-09-30 15:35:35.000000000 +0200 +++ /var/tmp/diff_new_pack.nltduY/_new 2016-09-30 15:35:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: the_silver_searcher -Version: 0.32.0 +Version: 0.33.0 Release: 0 Summary: A code-searching tool similar to ack, but faster License: Apache-2.0 @@ -27,7 +27,7 @@ Source2: http://geoff.greer.fm/ag/releases/%{name}-%{version}.tar.gz.asc Source3: %{name}.keyring Source4: %{name}.changes -BuildRequires: pkg-config >= 0.9.0 +BuildRequires: pkgconfig >= 0.9.0 Requires: bash-completion BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 @@ -51,7 +51,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install mkdir -p %{buildroot}/%{_sysconfdir}/bash_completion.d mv -v %{buildroot}%{_datadir}/%{name}/completions/ag.bashcomp.sh %{buildroot}/%{_sysconfdir}/bash_completion.d/%{name} @@ -59,7 +59,7 @@ %defattr(-,root,root) %doc LICENSE NOTICE README.md %{_bindir}/ag -%{_mandir}/man1/ag.1.gz +%{_mandir}/man1/ag.1%{ext_man} %config %{_sysconfdir}/bash_completion.d/%{name} %changelog ++++++ the_silver_searcher-0.32.0.tar.gz -> the_silver_searcher-0.33.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/NOTICE new/the_silver_searcher-0.33.0/NOTICE --- old/the_silver_searcher-0.32.0/NOTICE 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/NOTICE 2016-06-23 20:33:43.000000000 +0200 @@ -1,2 +1,2 @@ The Silver Searcher -Copyright 2011-2014 Geoff Greer +Copyright 2011-2016 Geoff Greer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/README.md new/the_silver_searcher-0.33.0/README.md --- old/the_silver_searcher-0.32.0/README.md 2016-05-10 19:39:39.000000000 +0200 +++ new/the_silver_searcher-0.33.0/README.md 2016-09-24 03:33:26.000000000 +0200 @@ -15,7 +15,7 @@ * It is an order of magnitude faster than `ack`. * It ignores file patterns from your `.gitignore` and `.hgignore`. -* If there are files in your source repo you don't want to search, just add their patterns to a `.agignore` file. (\*cough\* extern \*cough\*) +* If there are files in your source repo you don't want to search, just add their patterns to a `.ignore` file. (\*cough\* `*.min.js` \*cough\*) * The command name is 33% shorter than `ack`, and all keys are on the home row! Ag is quite stable now. Most changes are new features, minor bug fixes, or performance improvements. It's much faster than Ack in my benchmarks: @@ -64,8 +64,7 @@ dnf install the_silver_searcher * RHEL7+ - rpm -Uvh http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noar… - yum install the_silver_searcher + yum install epel-release.noarch the_silver_searcher * Gentoo emerge the_silver_searcher @@ -158,7 +157,7 @@ ### Emacs -You can use [ag.el][] as an Emacs fronted to Ag. See also: [helm-ag]. +You can use [ag.el][] as an Emacs front-end to Ag. See also: [helm-ag]. [ag.el]: https://github.com/Wilfred/ag.el [helm-ag]: https://github.com/syohex/emacs-helm-ag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/ag.bashcomp.sh new/the_silver_searcher-0.33.0/ag.bashcomp.sh --- old/the_silver_searcher-0.32.0/ag.bashcomp.sh 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/ag.bashcomp.sh 2016-06-23 20:33:43.000000000 +0200 @@ -1,5 +1,3 @@ -#!/bin/bash - _ag() { local lngopt shtopt split=false local cur prev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/configure new/the_silver_searcher-0.33.0/configure --- old/the_silver_searcher-0.32.0/configure 2016-05-16 07:14:57.000000000 +0200 +++ new/the_silver_searcher-0.33.0/configure 2016-09-24 22:33:17.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for the_silver_searcher 0.32.0. +# Generated by GNU Autoconf 2.69 for the_silver_searcher 0.33.0. # # Report bugs to <https://github.com/ggreer/the_silver_searcher/issues>. # @@ -581,8 +581,8 @@ # Identity of this package. PACKAGE_NAME='the_silver_searcher' PACKAGE_TARNAME='the_silver_searcher' -PACKAGE_VERSION='0.32.0' -PACKAGE_STRING='the_silver_searcher 0.32.0' +PACKAGE_VERSION='0.33.0' +PACKAGE_STRING='the_silver_searcher 0.33.0' PACKAGE_BUGREPORT='https://github.com/ggreer/the_silver_searcher/issues' PACKAGE_URL='https://github.com/ggreer/the_silver_searcher' @@ -1297,7 +1297,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures the_silver_searcher 0.32.0 to adapt to many kinds of systems. +\`configure' configures the_silver_searcher 0.33.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1368,7 +1368,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of the_silver_searcher 0.32.0:";; + short | recursive ) echo "Configuration of the_silver_searcher 0.33.0:";; esac cat <<\_ACEOF @@ -1471,7 +1471,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -the_silver_searcher configure 0.32.0 +the_silver_searcher configure 0.33.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1943,7 +1943,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by the_silver_searcher $as_me 0.32.0, which was +It was created by the_silver_searcher $as_me 0.33.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2807,7 +2807,7 @@ # Define the identity of the package. PACKAGE='the_silver_searcher' - VERSION='0.32.0' + VERSION='0.33.0' # Some tools Automake needs. @@ -5512,7 +5512,7 @@ ac_config_headers="$ac_config_headers src/config.h" -for ac_prog in clang-format-3.7 clang-format-3.6 clang-format +for ac_prog in clang-format-3.8 clang-format-3.7 clang-format-3.6 clang-format do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6107,7 +6107,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by the_silver_searcher $as_me 0.32.0, which was +This file was extended by the_silver_searcher $as_me 0.33.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6174,7 +6174,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -the_silver_searcher config.status 0.32.0 +the_silver_searcher config.status 0.33.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/configure.ac new/the_silver_searcher-0.33.0/configure.ac --- old/the_silver_searcher-0.32.0/configure.ac 2016-05-16 07:13:17.000000000 +0200 +++ new/the_silver_searcher-0.33.0/configure.ac 2016-09-24 22:03:14.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT( [the_silver_searcher], - [0.32.0], + [0.33.0], [https://github.com/ggreer/the_silver_searcher/issues] [the_silver_searcher], [https://github.com/ggreer/the_silver_searcher] @@ -64,7 +64,7 @@ AC_CHECK_PROGS( [CLANG_FORMAT], - [clang-format-3.7 clang-format-3.6 clang-format], + [clang-format-3.8 clang-format-3.7 clang-format-3.6 clang-format], [no] ) AM_CONDITIONAL([HAS_CLANG_FORMAT], [test x$CLANG_FORMAT != xno]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/doc/ag.1 new/the_silver_searcher-0.33.0/doc/ag.1 --- old/the_silver_searcher-0.32.0/doc/ag.1 2016-05-16 07:20:04.000000000 +0200 +++ new/the_silver_searcher-0.33.0/doc/ag.1 2016-09-25 02:18:03.000000000 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "AG" "1" "February 2015" "" "" +.TH "AG" "1" "September 2016" "" "" . .SH "NAME" \fBag\fR \- The Silver Searcher\. Like ack, but faster\. @@ -19,16 +19,20 @@ Output results in a format parseable by AckMate \fIhttps://github\.com/protocool/AckMate\fR\. . .TP +\fB\-\-[no]affinity\fR +Set thread affinity (if platform supports it)\. Default is true\. +. +.TP \fB\-a \-\-all\-types\fR Search all files\. This doesn\'t include hidden files, and doesn\'t respect any ignore files\. . .TP \fB\-A \-\-after [LINES]\fR -Print lines after match\. Defaults to 2\. +Print lines after match\. If not provided, LINES defaults to 2\. . .TP \fB\-B \-\-before [LINES]\fR -Print lines before match\. Defaults to 2\. +Print lines before match\. If not provided, LINES defaults to 2\. . .TP \fB\-\-[no]break\fR @@ -44,15 +48,15 @@ . .TP \fB\-\-color\-line\-number\fR -Color codes for line numbers\. Defaults to 1;33\. +Color codes for line numbers\. Default is 1;33\. . .TP \fB\-\-color\-match\fR -Color codes for result match numbers\. Defaults to 30;43\. +Color codes for result match numbers\. Default is 30;43\. . .TP \fB\-\-color\-path\fR -Color codes for path names\. Defaults to 1;32\. +Color codes for path names\. Default is 1;32\. . .TP \fB\-\-column\fR @@ -60,11 +64,11 @@ . .TP \fB\-C \-\-context [LINES]\fR -Print lines before and after matches\. Defaults to 2\. +Print lines before and after matches\. Default is 2\. . .TP \fB\-D \-\-debug\fR -Output ridiculous amounts of debugging info\. Probably not useful\. +Output ridiculous amounts of debugging info\. Not useful unless you\'re actually debugging\. . .TP \fB\-\-depth NUM\fR @@ -75,8 +79,8 @@ Print file names\. Enabled by default, except when searching a single file\. . .TP -\fB\-f \-\-follow\fR -Follow symlinks\. +\fB\-f \-\-[no]follow\fR +Follow symlinks\. Default is false\. . .TP \fB\-F \-\-fixed\-strings\fR @@ -131,6 +135,18 @@ Skip the rest of a file after NUM matches\. Default is 0, which never skips\. . .TP +\fB\-\-[no]mmap\fR +Toggle use of memory\-mapped I/O\. Defaults to true\. +. +.TP +\fB\-\-[no]multiline\fR +Match regexes across newlines\. Enabled by default\. +. +.TP +\fB\-n \-\-norecurse\fR +Don\'t recurse into directories\. +. +.TP \fB\-\-[no]numbers\fR Print line numbers\. Default is to omit line numbers when searching streams\. . @@ -139,19 +155,27 @@ Print only the matching part of the lines\. . .TP -\fB\-p \-\-path\-to\-agignore STRING\fR -Provide a path to a specific \.agignore file\. +\fB\-\-one\-device\fR +When recursing directories, don\'t scan dirs that reside on other storage devices\. This lets you avoid scanning slow network mounts\. This feature is not supported on all platforms\. +. +.TP +\fB\-p \-\-path\-to\-ignore STRING\fR +Provide a path to a specific \.ignore file\. . .TP \fB\-\-pager COMMAND\fR -Use a pager such as less\. Use \fB\-\-nopager\fR to override\. This option is also ignored if output is piped to another program\. +Use a pager such as \fBless\fR\. Use \fB\-\-nopager\fR to override\. This option is also ignored if output is piped to another program\. +. +.TP +\fB\-\-parallel\fR +Parse the input stream as a search term, not data to search\. This is meant to be used with tools such as GNU parallel\. For example: \fBecho "foo\enbar\enbaz" | parallel "ag {} \."\fR will run 3 instances of ag, searching the current directory for "foo", "bar", and "baz"\. . .TP \fB\-\-print\-long\-lines\fR Print matches on very long lines (> 2k characters by default)\. . .TP -\fB\-\-passthrough\fR +\fB\-\-passthrough \-\-passthru\fR When searching a stream, print all lines even if they don\'t match\. . .TP @@ -159,6 +183,10 @@ Do not parse PATTERN as a regular expression\. Try to match it literally\. . .TP +\fB\-r \-\-recurse\fR +Recurse into directories when seacrhing\. Default is true\. +. +.TP \fB\-s \-\-case\-sensitive\fR Match case\-sensitively\. . @@ -179,7 +207,7 @@ Print stats (files scanned, time taken, etc)\. . .TP -\fB\-\-stats-only\fR +\fB\-\-stats\-only\fR Print stats (files scanned, time taken, etc) and nothing else\. . .TP @@ -188,55 +216,57 @@ . .TP \fB\-u \-\-unrestricted\fR -Search \fIall\fR files\. This ignores \.agignore, \.gitignore, etc\. It searches binary and hidden files as well\. +Search \fIall\fR files\. This ignores \.ignore, \.gitignore, etc\. It searches binary and hidden files as well\. . .TP \fB\-U \-\-skip\-vcs\-ignores\fR -Ignore VCS ignore files (\.gitignore, \.hgignore, svn:ignore), but still use \.agignore\. +Ignore VCS ignore files (\.gitignore, \.hgignore, svn:ignore), but still use \.ignore\. . .TP \fB\-v \-\-invert\-match\fR Match every line \fInot\fR containing the specified pattern\. . .TP -\fB\-\-vimgrep\fR -Output results like vim\'s \fB:vimgrep /pattern/g\fR would (it reports every match on the line)\. +\fB\-V \-\-version\fR +Print version info\. . -.br -Here\'s a ~/\.vimrc configuration example: +.TP +\fB\-\-vimgrep\fR +Output results in the same form as Vim\'s \fB:vimgrep /pattern/g\fR . .IP -\fBset grepprg=ag\e \-\-vimgrep\e $*\fR -. -.br -\fBset grepformat=%f:%l:%c:%m\fR +Here is a ~/\.vimrc configuration example: . .IP -Then use \fB:grep\fR to grep for something\. +\fBset grepprg=ag\e \-\-vimgrep\e $*\fR \fBset grepformat=%f:%l:%c:%m\fR . -.br -Then use \fB:copen\fR, \fB:cn\fR, \fB:cp\fR, etc\. to navigate through the matches\. +.IP +Then use \fB:grep\fR to grep for something\. Then use \fB:copen\fR, \fB:cn\fR, \fB:cp\fR, etc\. to navigate through the matches\. . .TP \fB\-w \-\-word\-regexp\fR Only match whole words\. . .TP +\fB\-\-workers NUM\fR +Use NUM worker threads\. Default is the number of CPU cores, with a max of 8\. +. +.TP \fB\-z \-\-search\-zip\fR -Search contents of compressed files\. +Search contents of compressed files\. Currently, gz and xz are supported\. This option requires that ag is built with lzma and zlib\. . .TP \fB\-0 \-\-null \-\-print0\fR Separate the filenames with \fB\e0\fR, rather than \fB\en\fR: this allows \fBxargs \-0 <command>\fR to correctly process filenames containing spaces or newlines\. . .SH "FILE TYPES" -It is possible to restrict the types of files searched\. For example, passing \fB\-\-html\fR as the \fBfile\-types\fR parameter will search only files with the extensions \fBhtm\fR, \fBhtml\fR, \fBshtml\fR or \fBxhtml\fR\. For a list of supported \fBfile\-types\fR run \fBag \-\-list\-file\-types\fR\. +It is possible to restrict the types of files searched\. For example, passing \fB\-\-html\fR as the \fBfile\-types\fR parameter will search only files with the extensions \fBhtm\fR, \fBhtml\fR, \fBshtml\fR or \fBxhtml\fR\. For a list of supported types, run \fBag \-\-list\-file\-types\fR\. . .SH "IGNORING FILES" -By default, ag will ignore files whose names match patterns in \.gitignore, \.hgignore, or \.agignore\. These files can be anywhere in the directories being searched\. Ag also ignores files matched by the svn:ignore property if \fBsvn \-\-version\fR is 1\.6 or older\. Finally, ag looks in $HOME/\.agignore for ignore patterns\. Binary files are ignored by default as well\. +By default, ag will ignore files whose names match patterns in \.gitignore, \.hgignore, or \.ignore\. These files can be anywhere in the directories being searched\. Ag also ignores files matched by the svn:ignore property if \fBsvn \-\-version\fR is 1\.6 or older\. Finally, ag looks in $HOME/\.agignore for ignore patterns\. Binary files are ignored by default as well\. . .P -If you want to ignore \.gitignore, \.hgignore, and svn:ignore, but still take \.agignore into account, use \fB\-U\fR\. +If you want to ignore \.gitignore, \.hgignore, and svn:ignore, but still take \.ignore into account, use \fB\-U\fR\. . .P Use the \fB\-t\fR option to search all text files; \fB\-a\fR to search all files; and \fB\-u\fR to search all, including hidden files\. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/ignore.c new/the_silver_searcher-0.33.0/src/ignore.c --- old/the_silver_searcher-0.32.0/src/ignore.c 2016-05-10 19:39:37.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/ignore.c 2016-09-24 22:30:46.000000000 +0200 @@ -1,5 +1,6 @@ #include <ctype.h> #include <dirent.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -27,9 +28,11 @@ NULL }; -/* Warning: changing the first string will break skip_vcs_ignores. */ +/* Warning: changing the first two strings will break skip_vcs_ignores. */ const char *ignore_pattern_files[] = { + /* Warning: .agignore will one day be removed in favor of .ignore */ ".agignore", + ".ignore", ".gitignore", ".git/info/exclude", ".hgignore", @@ -208,6 +211,10 @@ int matches; while (fscanf(fp, "K %zu\n", &key_len) == 1) { + if (key_len >= INT_MAX) { + log_debug("Unable to parse svnignore file %s: key is absurdly long.", dir_prop_base); + goto cleanup; + } key = ag_realloc(key, key_len + 1); bytes_read = fread(key, 1, key_len, fp); key[key_len] = '\0'; @@ -220,7 +227,11 @@ if (strncmp(SVN_PROP_IGNORE, key, bytes_read) != 0) { log_debug("key is %s, not %s. skipping %u bytes", key, SVN_PROP_IGNORE, entry_len); /* Not the key we care about. fseek and repeat */ - fseek(fp, entry_len + 1, SEEK_CUR); /* +1 to account for newline. yes I know this is hacky */ + int rv = fseek(fp, entry_len + 1, SEEK_CUR); /* +1 to account for newline. yes I know this is hacky */ + if (rv == -1) { + log_debug("Skipping svnignore file %s: fseek() error.", dir_prop_base); + goto cleanup; + } continue; } /* Aww yeah. Time to ignore stuff */ @@ -358,7 +369,7 @@ return 0; } - if (opts.search_all_files && !opts.path_to_agignore) { + if (opts.search_all_files && !opts.path_to_ignore) { return 1; } @@ -384,20 +395,23 @@ } } -/* TODO: don't call strlen on filename every time we call filename_filter() */ #ifdef HAVE_DIRENT_DNAMLEN size_t filename_len = dir->d_namlen; #else - size_t filename_len = strlen(filename); + size_t filename_len = 0; +#endif + + if (strncmp(filename, "./", 2) == 0) { +#ifndef HAVE_DIRENT_DNAMLEN + filename_len = strlen(filename); #endif + filename++; + filename_len--; + } + const ignores *ig = scandir_baton->ig; while (ig != NULL) { - if (strncmp(filename, "./", 2) == 0) { - filename++; - filename_len--; - } - if (extension) { int match_pos = binary_search(extension, ig->extensions, 0, ig->extensions_len); if (match_pos >= 0) { @@ -410,13 +424,20 @@ return 0; } - if (is_directory(path, dir) && filename[filename_len - 1] != '/') { - char *temp; - ag_asprintf(&temp, "%s/", filename); - int rv = path_ignore_search(ig, path_start, temp); - free(temp); - if (rv) { - return 0; + if (is_directory(path, dir)) { +#ifndef HAVE_DIRENT_DNAMLEN + if (!filename_len) { + filename_len = strlen(filename); + } +#endif + if (filename[filename_len - 1] != '/') { + char *temp; + ag_asprintf(&temp, "%s/", filename); + int rv = path_ignore_search(ig, path_start, temp); + free(temp); + if (rv) { + return 0; + } } } ig = ig->parent; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/lang.c new/the_silver_searcher-0.33.0/src/lang.c --- old/the_silver_searcher-0.32.0/src/lang.c 2016-05-12 09:19:27.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/lang.c 2016-07-09 19:51:01.000000000 +0200 @@ -70,7 +70,7 @@ { "python", { "py" } }, { "qml", { "qml" } }, { "racket", { "rkt", "ss", "scm" } }, - { "rake", { "Rakefiles" } }, + { "rake", { "Rakefile" } }, { "restructuredtext", { "rst" } }, { "rs", { "rs" } }, { "r", { "R", "Rmd", "Rnw", "Rtex", "Rrst" } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/log.c new/the_silver_searcher-0.33.0/src/log.c --- old/the_silver_searcher-0.32.0/src/log.c 2016-05-10 19:39:41.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/log.c 2016-09-03 17:39:14.000000000 +0200 @@ -1,5 +1,5 @@ -#include <stdio.h> #include <stdarg.h> +#include <stdio.h> #include "log.h" #include "util.h" @@ -43,6 +43,7 @@ return; } + pthread_mutex_lock(&print_mtx); FILE *stream = out_fd; switch (level) { @@ -63,6 +64,7 @@ vfprintf(stream, fmt, args); fprintf(stream, "\n"); + pthread_mutex_unlock(&print_mtx); } void plog(const unsigned int level, const char *fmt, ...) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/log.h new/the_silver_searcher-0.33.0/src/log.h --- old/the_silver_searcher-0.32.0/src/log.h 2016-05-10 19:39:41.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/log.h 2016-09-03 17:39:14.000000000 +0200 @@ -3,6 +3,14 @@ #include <stdarg.h> +#include "config.h" + +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif + +pthread_mutex_t print_mtx; + enum log_level { LOG_LEVEL_DEBUG = 10, LOG_LEVEL_MSG = 20, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/main.c new/the_silver_searcher-0.33.0/src/main.c --- old/the_silver_searcher-0.32.0/src/main.c 2016-05-10 19:39:37.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/main.c 2016-09-24 02:56:42.000000000 +0200 @@ -1,8 +1,8 @@ +#include <ctype.h> #include <pcre.h> #include <stdarg.h> #include <stdio.h> #include <string.h> -#include <ctype.h> #include <sys/time.h> #include <unistd.h> #ifdef _WIN32 @@ -73,7 +73,7 @@ num_cores = (int)sysconf(_SC_NPROCESSORS_ONLN); #endif - workers_len = num_cores; + workers_len = num_cores < 8 ? num_cores : 8; if (opts.literal) { workers_len--; } @@ -126,7 +126,7 @@ } if (opts.word_regexp) { char *word_regexp_query; - ag_asprintf(&word_regexp_query, "\\b%s\\b", opts.query); + ag_asprintf(&word_regexp_query, "\\b(?:%s)\\b", opts.query); free(opts.query); opts.query = word_regexp_query; opts.query_len = strlen(opts.query); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/options.c new/the_silver_searcher-0.33.0/src/options.c --- old/the_silver_searcher-0.32.0/src/options.c 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/options.c 2016-09-25 01:55:10.000000000 +0200 @@ -10,11 +10,11 @@ #include "config.h" #include "ignore.h" -#include "options.h" #include "lang.h" #include "log.h" -#include "util.h" +#include "options.h" #include "print.h" +#include "util.h" const char *color_line_number = "\033[1;33m"; /* bold yellow */ const char *color_match = "\033[30;43m"; /* black with yellow background */ @@ -91,18 +91,18 @@ --ignore-dir NAME Alias for --ignore for compatibility with ack.\n\ -m --max-count NUM Skip the rest of a file after NUM matches (Default: 10,000)\n\ --one-device Don't follow links to other devices.\n\ - -p --path-to-agignore STRING\n\ - Use .agignore file at STRING\n\ + -p --path-to-ignore STRING\n\ + Use .ignore file at STRING\n\ -Q --literal Don't parse PATTERN as a regular expression\n\ -s --case-sensitive Match case sensitively\n\ -S --smart-case Match case insensitively unless PATTERN contains\n\ uppercase characters (Enabled by default)\n\ --search-binary Search binary files for matches\n\ -t --all-text Search all text files (doesn't include hidden files)\n\ - -u --unrestricted Search all files (ignore .agignore, .gitignore, etc.;\n\ + -u --unrestricted Search all files (ignore .ignore, .gitignore, etc.;\n\ searches binary and hidden files as well)\n\ -U --skip-vcs-ignores Ignore VCS ignore files\n\ - (.gitignore, .hgignore, .svnignore; still obey .agignore)\n\ + (.gitignore, .hgignore, .svnignore; still obey .ignore)\n\ -v --invert-match\n\ -w --word-regexp Only match whole words\n\ -W --width NUM Truncate match lines after NUM characters\n\ @@ -144,6 +144,7 @@ opts.color_win_ansi = FALSE; opts.max_matches_per_file = 0; opts.max_search_depth = DEFAULT_MAX_SEARCH_DEPTH; + opts.mmap = TRUE; opts.multiline = TRUE; opts.width = 0; opts.path_sep = '\n'; @@ -257,6 +258,7 @@ { "literal", no_argument, NULL, 'Q' }, { "match", no_argument, &useless, 0 }, { "max-count", required_argument, NULL, 'm' }, + { "mmap", no_argument, &opts.mmap, TRUE }, { "multiline", no_argument, &opts.multiline, TRUE }, /* "no-" is deprecated. Remove these eventually. */ { "no-numbers", no_argument, &opts.print_line_numbers, FALSE }, @@ -268,6 +270,7 @@ { "nofollow", no_argument, &opts.follow_symlinks, 0 }, { "nogroup", no_argument, &group, 0 }, { "noheading", no_argument, &opts.print_path, PATH_PRINT_EACH_LINE }, + { "nommap", no_argument, &opts.mmap, FALSE }, { "nomultiline", no_argument, &opts.multiline, FALSE }, { "nonumbers", no_argument, &opts.print_line_numbers, FALSE }, { "nopager", no_argument, NULL, 0 }, @@ -280,7 +283,7 @@ { "parallel", no_argument, &opts.parallel, 1 }, { "passthrough", no_argument, &opts.passthrough, 1 }, { "passthru", no_argument, &opts.passthrough, 1 }, - { "path-to-agignore", required_argument, NULL, 'p' }, + { "path-to-ignore", required_argument, NULL, 'p' }, { "print0", no_argument, NULL, '0' }, { "print-long-lines", no_argument, &opts.print_long_lines, 1 }, { "recurse", no_argument, NULL, 'r' }, @@ -432,7 +435,7 @@ opts.recurse_dirs = 0; break; case 'p': - opts.path_to_agignore = optarg; + opts.path_to_ignore = optarg; break; case 'o': opts.only_matching = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/options.h new/the_silver_searcher-0.33.0/src/options.h --- old/the_silver_searcher-0.32.0/src/options.h 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/options.h 2016-09-24 22:30:36.000000000 +0200 @@ -51,11 +51,12 @@ int literal_ends_wordchar; size_t max_matches_per_file; int max_search_depth; + int mmap; int multiline; int one_dev; int only_matching; char path_sep; - char *path_to_agignore; + char *path_to_ignore; int print_break; int print_count; int print_filename_only; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/print.c new/the_silver_searcher-0.33.0/src/print.c --- old/the_silver_searcher-0.32.0/src/print.c 2016-05-10 19:39:41.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/print.c 2016-06-23 20:33:43.000000000 +0200 @@ -1,8 +1,8 @@ +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "ignore.h" #include "log.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/print_w32.c new/the_silver_searcher-0.33.0/src/print_w32.c --- old/the_silver_searcher-0.32.0/src/print_w32.c 2016-05-10 19:39:38.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/print_w32.c 2016-06-23 20:33:43.000000000 +0200 @@ -1,10 +1,10 @@ #ifdef _WIN32 -#include <windows.h> -#include <stdio.h> +#include "print.h" #include <io.h> #include <stdarg.h> -#include "print.h" +#include <stdio.h> +#include <windows.h> #ifndef FOREGROUND_MASK #define FOREGROUND_MASK (FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/search.c new/the_silver_searcher-0.33.0/src/search.c --- old/the_silver_searcher-0.32.0/src/search.c 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/search.c 2016-09-24 22:33:08.000000000 +0200 @@ -38,7 +38,7 @@ if (!opts.literal && opts.query_len == 1 && opts.query[0] == '.') { matches_size = 1; - matches = ag_malloc(matches_size * sizeof(match_t)); + matches = matches == NULL ? ag_malloc(matches_size * sizeof(match_t)) : matches; matches[0].start = 0; matches[0].end = buf_len; matches_len = 1; @@ -286,16 +286,25 @@ goto cleanup; } #else - buf = mmap(0, f_len, PROT_READ, MAP_SHARED, fd, 0); - if (buf == MAP_FAILED) { - log_err("File %s failed to load: %s.", file_full_path, strerror(errno)); - goto cleanup; - } + + if (opts.mmap) { + buf = mmap(0, f_len, PROT_READ, MAP_PRIVATE, fd, 0); + if (buf == MAP_FAILED) { + log_err("File %s failed to load: %s.", file_full_path, strerror(errno)); + goto cleanup; + } #if HAVE_MADVISE - madvise(buf, f_len, MADV_SEQUENTIAL); + madvise(buf, f_len, MADV_SEQUENTIAL); #elif HAVE_POSIX_FADVISE - posix_fadvise(fd, 0, f_len, POSIX_MADV_SEQUENTIAL); + posix_fadvise(fd, 0, f_len, POSIX_MADV_SEQUENTIAL); #endif + } else { + buf = ag_malloc(f_len); + size_t bytes_read = read(fd, buf, f_len); + if ((off_t)bytes_read != f_len) { + die("expected to read %u bytes but read %u", f_len, bytes_read); + } + } #endif if (opts.search_zip_files) { @@ -321,7 +330,11 @@ #ifdef _WIN32 UnmapViewOfFile(buf); #else - munmap(buf, f_len); + if (opts.mmap) { + munmap(buf, f_len); + } else { + free(buf); + } #endif } if (fd != -1) { @@ -435,8 +448,8 @@ return; } - /* find agignore/gitignore/hgignore/etc files to load ignore patterns from */ - for (i = 0; opts.skip_vcs_ignores ? (i == 0) : (ignore_pattern_files[i] != NULL); i++) { + /* find .*ignore files to load ignore patterns from */ + for (i = 0; opts.skip_vcs_ignores ? (i <= 1) : (ignore_pattern_files[i] != NULL); i++) { ignore_file = ignore_pattern_files[i]; ag_asprintf(&dir_full_path, "%s/%s", path, ignore_file); if (strcmp(SVN_DIR, ignore_file) == 0) { @@ -448,8 +461,9 @@ dir_full_path = NULL; } - if (opts.path_to_agignore) { - load_ignore_patterns(ig, opts.path_to_agignore); + /* TODO: this is extremely wasteful */ + if (opts.path_to_ignore) { + load_ignore_patterns(ig, opts.path_to_ignore); } scandir_baton.ig = ig; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/search.h new/the_silver_searcher-0.33.0/src/search.h --- old/the_silver_searcher-0.32.0/src/search.h 2016-05-10 19:39:41.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/search.h 2016-09-03 17:39:14.000000000 +0200 @@ -23,13 +23,13 @@ #include <pthread.h> #endif +#include "decompress.h" #include "ignore.h" #include "log.h" #include "options.h" #include "print.h" -#include "util.h" -#include "decompress.h" #include "uthash.h" +#include "util.h" size_t alpha_skip_lookup[256]; size_t *find_skip_lookup; @@ -44,7 +44,6 @@ work_queue_t *work_queue_tail; int done_adding_files; pthread_cond_t files_ready; -pthread_mutex_t print_mtx; pthread_mutex_t stats_mtx; pthread_mutex_t work_queue_mtx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/uthash.h new/the_silver_searcher-0.33.0/src/uthash.h --- old/the_silver_searcher-0.32.0/src/uthash.h 2016-05-10 19:39:38.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/uthash.h 2016-06-23 20:33:43.000000000 +0200 @@ -24,9 +24,9 @@ #ifndef UTHASH_H #define UTHASH_H -#include <string.h> /* memcmp,strlen */ #include <stddef.h> /* ptrdiff_t */ #include <stdlib.h> /* exit() */ +#include <string.h> /* memcmp,strlen */ /* These macros use decltype or the earlier __typeof GNU extension. As decltype is only available in newer compilers (VS2010 or gcc 4.3+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/util.c new/the_silver_searcher-0.33.0/src/util.c --- old/the_silver_searcher-0.32.0/src/util.c 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/util.c 2016-09-02 00:25:39.000000000 +0200 @@ -1,12 +1,12 @@ #include <ctype.h> -#include <string.h> -#include <stdio.h> #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/stat.h> -#include "util.h" #include "config.h" +#include "util.h" #ifdef _WIN32 #include <windows.h> @@ -292,6 +292,7 @@ size_t i; if (buf_len == 0) { + /* Is an empty file binary? Is it text? */ return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/src/util.h new/the_silver_searcher-0.33.0/src/util.h --- old/the_silver_searcher-0.32.0/src/util.h 2016-05-10 19:39:40.000000000 +0200 +++ new/the_silver_searcher-0.33.0/src/util.h 2016-06-23 20:33:43.000000000 +0200 @@ -4,8 +4,8 @@ #include <dirent.h> #include <pcre.h> #include <stdio.h> -#include <string.h> #include <stdio.h> +#include <string.h> #include <sys/time.h> #include "config.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/the_silver_searcher.spec new/the_silver_searcher-0.33.0/the_silver_searcher.spec --- old/the_silver_searcher-0.32.0/the_silver_searcher.spec 2016-05-16 07:16:07.000000000 +0200 +++ new/the_silver_searcher-0.33.0/the_silver_searcher.spec 2016-09-25 02:22:49.000000000 +0200 @@ -2,7 +2,7 @@ Name: the_silver_searcher -Version: 0.32.0 +Version: 0.33.0 Release: 1%{?dist} Summary: A code-searching tool similar to ack, but faster @@ -22,7 +22,7 @@ Why use Ag? * It searches code about 3–5× faster than ack. * It ignores file patterns from your .gitignore and .hgignore. -* If there are files in your source repo you don't want to search, just add their patterns to a .agignore file. *cough* extern *cough* +* If there are files in your source repo you don't want to search, just add their patterns to a .ignore file. *cough* extern *cough* * The command name is 33% shorter than ack! How is it so fast? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/the_silver_searcher-0.32.0/the_silver_searcher.spec.in new/the_silver_searcher-0.33.0/the_silver_searcher.spec.in --- old/the_silver_searcher-0.32.0/the_silver_searcher.spec.in 2016-05-10 19:39:38.000000000 +0200 +++ new/the_silver_searcher-0.33.0/the_silver_searcher.spec.in 2016-09-24 03:33:26.000000000 +0200 @@ -22,7 +22,7 @@ Why use Ag? * It searches code about 3–5× faster than ack. * It ignores file patterns from your .gitignore and .hgignore. -* If there are files in your source repo you don't want to search, just add their patterns to a .agignore file. *cough* extern *cough* +* If there are files in your source repo you don't want to search, just add their patterns to a .ignore file. *cough* extern *cough* * The command name is 33% shorter than ack! How is it so fast?

1 0

commit espresso for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package espresso for openSUSE:Factory checked in at 2016-09-30 15:35:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/espresso (Old) and /work/SRC/openSUSE:Factory/.espresso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "espresso" Changes: -------- --- /work/SRC/openSUSE:Factory/espresso/espresso.changes 2016-08-05 18:18:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.espresso.new/espresso.changes 2016-09-30 15:35:30.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 29 13:46:20 UTC 2016 - jengelh(a)inai.de + +- RPM group fixup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ espresso.spec ++++++ --- /var/tmp/diff_new_pack.PugKbK/_old 2016-09-30 15:35:32.000000000 +0200 +++ /var/tmp/diff_new_pack.PugKbK/_new 2016-09-30 15:35:32.000000000 +0200 @@ -56,13 +56,13 @@ BuildRequires: texlive-helvetic BuildRequires: texlive-jknapltx BuildRequires: texlive-latex-bin-bin -BuildRequires: texlive-mathtools BuildRequires: texlive-makeindex-bin +BuildRequires: texlive-mathtools BuildRequires: texlive-microtype BuildRequires: texlive-natbib -BuildRequires: texlive-rsfs BuildRequires: texlive-psnfss BuildRequires: texlive-revtex +BuildRequires: texlive-rsfs BuildRequires: texlive-siunitx BuildRequires: texlive-stmaryrd BuildRequires: texlive-subfigure @@ -75,8 +75,8 @@ Provides: espresso-common = %{version} Obsoletes: espresso-common < %{version} Provides: espresso-openmpi = %{version} -Obsoletes: espresso-openmpi < %{version} Obsoletes: espresso-devel < %{version} +Obsoletes: espresso-openmpi < %{version} Requires: espresso-common-tcl = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -90,7 +90,7 @@ %package doc Summary: Architecture independent documentation files for ESPResSo -Group: Productivity/Scientific/Chemistry +Group: Documentation/PDF BuildArch: noarch %description doc

1 0

commit sysbench for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package sysbench for openSUSE:Factory checked in at 2016-09-30 15:35:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysbench (Old) and /work/SRC/openSUSE:Factory/.sysbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysbench" Changes: -------- --- /work/SRC/openSUSE:Factory/sysbench/sysbench.changes 2016-08-28 12:18:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysbench.new/sysbench.changes 2016-09-30 15:35:27.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Sep 29 08:33:22 UTC 2016 - mpluskal(a)suse.com + +- Update to version 0.5.0+git.20160922: + * Adjust test_mutex.t to pass on slow machines. + * Fix LOCK TABLES statements for multi-table MySQL/MyISAM benchmarks. + * Basic tests for oltp.lua against MySQL and PostgreSQL. + * Prevent script_oltp_*.t failures on slower machines. + * {common,bulkinsert}.lua missing from Makefile + * Load script from pkgdatadir if not local + * Change lua scripts to 'require common' if a testdir wasn't passed + * add libaio-dev to travis + * Some typo fixes in the docs. +- Add sysbench_buffer_overflow.patch +- Enable internal testsuite + +------------------------------------------------------------------- Old: ---- sysbench-0.5.0+git.20160824.tar.xz New: ---- sysbench-0.5.0+git.20160922.tar.xz sysbench_buffer_overflow.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysbench.spec ++++++ --- /var/tmp/diff_new_pack.WCZjfV/_old 2016-09-30 15:35:29.000000000 +0200 +++ /var/tmp/diff_new_pack.WCZjfV/_new 2016-09-30 15:35:29.000000000 +0200 @@ -16,9 +16,9 @@ # -%define version_unconverted 0.5.0+git.20160824 +%define version_unconverted 0.5.0+git.20160922 Name: sysbench -Version: 0.5.0+git.20160824 +Version: 0.5.0+git.20160922 Release: 0 Summary: A MySQL benchmarking tool License: GPL-2.0 @@ -26,8 +26,12 @@ Url: https://github.com/akopytov/sysbench Source0: %{name}-%{version}.tar.xz Source1: %{name}-example-tests.tar.bz2 +Patch0: sysbench_buffer_overflow.patch BuildRequires: autoconf BuildRequires: automake +%if 0%{?is_opensuse} +BuildRequires: cram +%endif BuildRequires: docbook BuildRequires: docbook-xsl-stylesheets BuildRequires: help2man @@ -48,6 +52,7 @@ %prep %setup -q %setup -q -T -D -a 1 +%patch0 -p1 %build autoreconf -fiv @@ -66,6 +71,11 @@ %{buildroot}%{_datadir}/sysbench/sysbench-example-all-tests rm -rf %{buildroot}%{_datadir}/doc/sysbench +%if 0%{?is_opensuse} +%check +make check +%endif + %files %defattr(-,root,root) %doc COPYING ChangeLog README.md doc/manual.html ++++++ sysbench-0.5.0+git.20160824.tar.xz -> sysbench-0.5.0+git.20160922.tar.xz ++++++ ++++ 1780 lines of diff (skipped) ++++++ sysbench_buffer_overflow.patch ++++++ >From e6fab3260481d03301f135dbfde57fa5db000aaf Mon Sep 17 00:00:00 2001 From: Martin Pluskal <martin(a)pluskal.org> Date: Thu, 29 Sep 2016 10:39:47 +0200 Subject: [PATCH] Do not overflow buffer in strncat --- sysbench/scripting/script_lua.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysbench/scripting/script_lua.c b/sysbench/scripting/script_lua.c index 42f5106..7b71064 100644 --- a/sysbench/scripting/script_lua.c +++ b/sysbench/scripting/script_lua.c @@ -498,11 +498,11 @@ lua_State *sb_lua_new_state(const char *scriptname, int thread_id) /* first location failed - look in DATA_PATH */ char p[PATH_MAX + 1]; strncpy(p, DATA_PATH LUA_DIRSEP, sizeof(p)); - strncat(p, scriptname, sizeof(p)); + strncat(p, scriptname, sizeof(p)-strlen(p)-1); if (!strrchr(scriptname, '.')) { /* add .lua extension if there isn't one */ - strncat(p, ".lua", sizeof(p)); + strncat(p, ".lua", sizeof(p)-strlen(p)-1); } if (luaL_loadfile(state, p))

1 0

commit libressl for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package libressl for openSUSE:Factory checked in at 2016-09-30 15:35:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libressl (Old) and /work/SRC/openSUSE:Factory/.libressl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libressl" Changes: -------- --- /work/SRC/openSUSE:Factory/libressl/libressl.changes 2016-08-10 19:56:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libressl.new/libressl.changes 2016-09-30 15:35:24.000000000 +0200 @@ -1,0 +2,40 @@ +Thu Sep 29 06:10:02 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 2.5.0 +* libtls now supports ALPN and SNI +* libtls adds a new callback interface for integrating custom IO + functions. +* libtls now handles 4 cipher suite groups: "secure" + (TLSv1.2+AEAD+PFS), "compat" (HIGH:!aNULL), "legacy" + (HIGH:MEDIUM:!aNULL), "insecure" (ALL:!aNULL:!eNULL). This + allows for flexibility and finer grained control, rather than + having two extremes. +* libtls now always loads CA, key and certificate files at the + time the configuration function is called. +* Add support for OCSP intermediate certificates. +* Added functions used by stunnel and exim from BoringSSL - this + brings in X509_check_host, X509_check_email, X509_check_ip, and + X509_check_ip_asc. +* Improved behavior of arc4random on Windows when using memory + leak analysis software. +* Correctly handle an EOF that occurs prior to the TLS handshake + completing. +* Limit the support of the "backward compatible" ssl2 handshake + to only be used if TLS 1.0 is enabled. +* Fix incorrect results in certain cases on 64-bit systems when + BN_mod_word() can return incorrect results. BN_mod_word() now + can return an error condition. +* Added constant-time updates to address CVE-2016-0702 +* Fixed undefined behavior in BN_GF2m_mod_arr() +* Removed unused Cryptographic Message Support (CMS) +* More conversions of long long idioms to time_t +* Reverted change that cleans up the EVP cipher context in + EVP_EncryptFinal() and EVP_DecryptFinal(). Some software relies + on the previous behaviour. +* Avoid unbounded memory growth in libssl, which can be triggered + by a TLS client repeatedly renegotiating and sending OCSP + Status Request TLS extensions. +* Avoid falling back to a weak digest for (EC)DH when using SNI + with libssl. + +------------------------------------------------------------------- Old: ---- libressl-2.4.2.tar.gz libressl-2.4.2.tar.gz.asc New: ---- libressl-2.5.0.tar.gz libressl-2.5.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libressl.spec ++++++ --- /var/tmp/diff_new_pack.55bbn0/_old 2016-09-30 15:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.55bbn0/_new 2016-09-30 15:35:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: libressl -Version: 2.4.2 +Version: 2.5.0 Release: 0 Summary: An SSL/TLS protocol implementation License: OpenSSL ++++++ libressl-2.4.2.tar.gz -> libressl-2.5.0.tar.gz ++++++ ++++ 29987 lines of diff (skipped)

1 0

commit syncthing for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package syncthing for openSUSE:Factory checked in at 2016-09-30 15:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syncthing (Old) and /work/SRC/openSUSE:Factory/.syncthing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syncthing" Changes: -------- --- /work/SRC/openSUSE:Factory/syncthing/syncthing.changes 2016-09-12 13:27:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.syncthing.new/syncthing.changes 2016-09-30 15:35:22.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 29 07:01:32 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 0.14.7: + * Faster (i.e., less CPU intensive) hashing on some Intel and + ARM64 CPUs. + * A more refined dark theme. + * CORS headers in the API. + * Updated set of default discovery servers. + * Fix deadlock on device removal (gh#syncthing/syncthing#3596). + +------------------------------------------------------------------- Old: ---- syncthing-source-v0.14.6.tar.gz syncthing-source-v0.14.6.tar.gz.asc New: ---- syncthing-source-v0.14.7.tar.gz syncthing-source-v0.14.7.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syncthing.spec ++++++ --- /var/tmp/diff_new_pack.NxdSUa/_old 2016-09-30 15:35:24.000000000 +0200 +++ /var/tmp/diff_new_pack.NxdSUa/_new 2016-09-30 15:35:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: syncthing -Version: 0.14.6 +Version: 0.14.7 Release: 0 Summary: FOSS Continuous File Synchronisation License: MPL-2.0 ++++++ syncthing-source-v0.14.6.tar.gz -> syncthing-source-v0.14.7.tar.gz ++++++ /work/SRC/openSUSE:Factory/syncthing/syncthing-source-v0.14.6.tar.gz /work/SRC/openSUSE:Factory/.syncthing.new/syncthing-source-v0.14.7.tar.gz differ: char 5, line 1

1 0