Hello community, here is the log from the commit of package openstack-swift for openSUSE:Factory checked in at 2013-01-17 09:52:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-swift (Old) and /work/SRC/openSUSE:Factory/.openstack-swift.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-swift", Maintainer is "cth...@suse.com" Changes: -------- New Changes file: --- /dev/null 2013-01-09 19:40:42.352580873 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift-doc.changes 2013-01-17 09:52:56.000000000 +0100 @@ -0,0 +1,15 @@ +-------------------------------------------------------------------- +Mon Jan 7 12:46:38 UTC 2013 - cloud-de...@suse.de + +- Start using obs-service-github_tarballs + +------------------------------------------------------------------- +Thu Nov 15 14:55:21 UTC 2012 - sasc...@suse.de + +- Use openstack-macros + +------------------------------------------------------------------- +Tue Nov 13 15:56:32 UTC 2012 - sasc...@suse.de + +- Initial package, split out from openstack-swift.spec + --- /work/SRC/openSUSE:Factory/openstack-swift/openstack-swift.changes 2012-11-15 09:43:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift.changes 2013-01-17 09:52:56.000000000 +0100 @@ -2 +2,74 @@ -Thu Nov 8 13:20:36 UTC 2012 - sasc...@suse.de +Wed Jan 9 09:11:04 UTC 2013 - sasc...@suse.de + +- Remove the hard requires on python-netifaces-0.6, swift seems to + always use fixed revision requirements which seem to be bogus + +-------------------------------------------------------------------- +Mon Jan 7 12:46:38 UTC 2013 - cloud-de...@suse.de + +- Start using obs-service-github_tarballs + +------------------------------------------------------------------- +Fri Dec 7 12:18:59 UTC 2012 - sasc...@suse.de + +- Don't use /var/log/subsys + +------------------------------------------------------------------- +Wed Dec 5 09:38:55 UTC 2012 - sasc...@suse.de + +- Use @PARENT_TAG@ in _service file to automate versioning + +------------------------------------------------------------------- +Mon Dec 3 09:38:54 UTC 2012 - sasc...@suse.de + +- Drop openstack-swift-create-man-stubs.py: + + Install manpages from upstream tarball instead + + Drop dependencies on Jinja2, Paste, PasteDeploy +- Fix test requires on python-openstack.nose_plugin +- Minor rpmlint issues fixed + +------------------------------------------------------------------- +Mon Nov 19 15:18:58 UTC 2012 - sasc...@suse.de + +- Install /etc/swift/test.conf for .unitests + +------------------------------------------------------------------- +Mon Nov 19 12:57:07 UTC 2012 - sasc...@suse.de + +- Add missing spaces to "Requires: python-Swift >= 1.1.2" + +------------------------------------------------------------------- +Fri Nov 16 12:41:27 UTC 2012 - sasc...@suse.de + +- Add .*test files to test package + +------------------------------------------------------------------- +Thu Nov 15 14:55:35 UTC 2012 - sasc...@suse.de + +- Use openstack-macros + +------------------------------------------------------------------- +Tue Nov 13 16:12:31 UTC 2012 - sasc...@suse.de + +- Split out doc package into seperate spec file +- Update test sub-package requirements + +------------------------------------------------------------------- +Mon Nov 12 14:29:12 UTC 2012 - sasc...@suse.de + +- Update to version 1.7.4 (Folsom): + + See https://github.com/openstack/swift/commits/stable/folsom +- Dropped the following upstreamed patches: + + dir-traversals-checks.patch + + rsync_object_replication.patch + + swift-memcache-no-pickle.patch + + test_runners.patch + + test_swift.patch +- Updated Requires based on tools/pip-requires +- /usr/bin/swift isn't provided anymore, use python-swiftclient therefor +- Added "reload" entries in init scripts: + + openstack-swift-container-auditor.init + + openstack-swift-proxy.init + +------------------------------------------------------------------- +Thu Nov 8 11:40:03 UTC 2012 - sasc...@suse.de @@ -7 +80 @@ -Wed Oct 31 14:54:28 UTC 2012 - sasc...@suse.de +Wed Oct 31 14:51:15 UTC 2012 - sasc...@suse.de @@ -10,0 +84,5 @@ + +------------------------------------------------------------------- +Tue Oct 9 15:27:36 UTC 2012 - vu...@suse.com + +- Require python-netifaces Old: ---- dir-traversals-checks.patch openstack-swift-create-man-stubs.py rsync_object_replication.patch swift-1.4.8+git.1332408124.4a6fead.tar.gz swift-memcache-no-pickle.patch test_runners.patch test_swift.patch New: ---- openstack-swift-doc.changes openstack-swift-doc.spec swift-stable-folsom.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-swift-doc.spec ++++++ # # spec file for package openstack-swift-doc # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define component swift Name: openstack-%{component}-doc Version: 1.7.4.1+git.1357562798.9c4c7bb Release: 0 License: Apache-2.0 Summary: OpenStack Storage (Swift) - Documentation Url: http://openstack.org/projects/compute/ Group: Documentation/HTML Source: swift-stable-folsom.tar.gz BuildRequires: openstack-macros BuildRequires: python-Sphinx BuildRequires: python-eventlet BuildRequires: python-netifaces BuildRequires: python-PasteDeploy BuildRequires: python-simplejson BuildRequires: python-swiftclient BuildRequires: python-webob BuildRequires: python-xattr BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description OpenStack Object Storage (swift) aggregates commodity servers to work together in clusters for reliable, redundant, and large-scale storage of static objects. This package contains documentation files for openstack-swift. %prep %setup -q -n swift-1.7.4.1 sed -i "s/\r//" LICENSE # Fix wrong-file-end-of-line-encoding warning %openstack_cleanup_prep %build python setup.py build_sphinx rm -rf doc/build/html/.buildinfo # Remove unneeded files %install %files %defattr(-,root,root,-) %doc LICENSE doc/build/html %changelog ++++++ openstack-swift.spec ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -1,4 +1,3 @@ -# # spec file for package openstack-swift # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. @@ -16,20 +15,18 @@ # -%global with_doc 1 - %define component swift %define groupname openstack-%{component} %define username openstack-%{component} Name: openstack-%{component} -Version: 1.4.8+git.1332408124.4a6fead +Version: 1.7.4.1+git.1357562798.9c4c7bb Release: 0 -Summary: OpenStack Storage (Swift) License: Apache-2.0 -Group: Development/Languages/Python +Summary: OpenStack Storage (Swift) Url: http://launchpad.net/swift -Source0: %{component}-%{version}.tar.gz +Group: Development/Languages/Python +Source: swift-stable-folsom.tar.gz Source1: %{name}-functions Source2: %{name}-account.init Source3: %{name}-account-auditor.init @@ -46,31 +43,24 @@ Source14: %{name}-object-updater.init Source15: %{name}-object-auditor.init Source16: %{name}-proxy.init -Source20: %{name}-create-man-stubs.py Source21: test-configs.tar.bz2 -Patch1: test_swift.patch -Patch2: test_runners.patch -Patch3: rsync_object_replication.patch -Patch4: dir-traversals-checks.patch -# PATCH-FIX-UPSTREAM swift-memcache-no-pickle.patch bnc#779215 CVE-2012-4406 vu...@suse.com -- do not use pickle serialization for memcache, but JSON -Patch5: swift-memcache-no-pickle.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dos2unix BuildRequires: fdupes -BuildRequires: python-Paste -BuildRequires: python-PasteDeploy +BuildRequires: openstack-macros BuildRequires: python-coverage BuildRequires: python-devel BuildRequires: python-distribute Requires: python >= 2.6.8 -Requires: python-PasteScript +Requires: python-WebOb >= 1.0.8 +#Requires: python-WebOb < 1.3 +Requires: python-PasteDeploy Requires: python-configobj -Requires: python-eventlet >= 0.9.8 +Requires: python-eventlet >= 0.9.15 Requires: python-greenlet >= 0.3.1 Requires: python-netifaces Requires: python-simplejson Requires: python-swift = %{version} -Requires: python-webob >= 0.9.8 +Requires: python-swiftclient Requires: python-xattr Requires: rsync Requires(post): %insserv_prereq @@ -102,6 +92,7 @@ Summary: OpenStack Storage (Swift) - Python module Group: Development/Languages/Python Requires: python >= 2.6.8 +Requires: python-netifaces %description -n python-swift This package contains the core Python module of OpenStack Swift. @@ -158,77 +149,33 @@ This package contains the openstack-swift proxy server. -%if 0%{?with_doc} -%package doc -Summary: OpenStack Storage (Swift) - Documentation -Group: Documentation/Other -BuildRequires: python-Sphinx -BuildRequires: python-eventlet -BuildRequires: python-netifaces -BuildRequires: python-simplejson -BuildRequires: python-webob -BuildRequires: python-xattr -BuildRequires: python-xml - -%description doc -OpenStack Object Storage (swift) aggregates commodity servers to work -together in clusters for reliable, redundant, and large-scale storage -of static objects. - -This package contains documentation files for openstack-swift. -%endif - %package test Summary: OpenStack Storage (Swift) - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} +Requires: python-coverage Requires: python-nose +Requires: python-nosexcover +Requires: python-openstack.nose_plugin +Requires: python-nosehtmloutput +Requires: python-pep8 +Requires: python-Sphinx >= 1.1.2 %description test The OpenStack Swift testsuite. It is used to verify the functionality of OpenStack Swift. %prep -%setup -q -n %{component}-%{version} -# Fix wrong-file-end-of-line-encoding warning -dos2unix LICENSE +%setup -q -n swift-1.7.4.1 +sed -i "s/\r//" LICENSE # Fix wrong-file-end-of-line-encoding warning tar xvf %{SOURCE21} -# Fix a failing unittest https://bugs.launchpad.net/swift/+bug/984042 -# patch is in master, but won't get backported because swift -%patch1 -p1 -# Fix return values of test runners so that they return their true exit status. -# Upstreamed, but only accepted in folsom: -# https://review.openstack.org/#/q/I0c2b0d6b17f560a889cd2f22ab98a68361f6d738,n,z -%patch2 -p1 -# fix object replication on older rsync versions when using ipv4 -# upstreamed, only for folsom -# https://review.openstack.org/#/c/7190/ -%patch3 -p1 -# add checks to avoid directory traversals, for additional security -# upstreamed, only for folsom -# https://review.openstack.org/#/c/8798/ -%patch4 -p1 -%patch5 -p1 -# disable intersphinx as it tries to fetch documentation via http which is not allowed during build -sed -i -e "s/,\? \?'sphinx.ext.intersphinx'//" doc/source/conf.py +%openstack_cleanup_prep %build python setup.py build -# Build docs -%if 0%{?with_doc} -export PYTHONPATH="$( pwd ):$PYTHONPATH" -pushd doc -sphinx-build -b html source build/html -popd -rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo -%endif - -# Build man stubs -python %{SOURCE20} --mandir=./man - %install -python setup.py install -O1 --skip-build --root %{buildroot} --prefix %{_prefix} +python setup.py install --root %{buildroot} --prefix %{_prefix} # Init helper functions install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/functions @@ -261,11 +208,10 @@ ln -s ../..%{_initddir}/%{name}-$server %{buildroot}%{_sbindir}/rc%{name}-$server done -# Install man stubs -for name in $( ls ./man ); do - mkdir -p "%{buildroot}%{_mandir}/$name" - cp "./man/$name/"*.gz "%{buildroot}%{_mandir}/$name" -done +# Install manpages +install -d %{buildroot}%{_mandir}/man{1,5}/ +install -m 0644 doc/manpages/*.1 %{buildroot}%{_mandir}/man1/ +install -m 0644 doc/manpages/*.5 %{buildroot}%{_mandir}/man5/ # Remove tests rm -fr %{buildroot}/%{python_sitelib}/test @@ -291,16 +237,12 @@ %fdupes %{buildroot}%{python_sitelib}/swift # test sub-package -install -d -m 755 %{buildroot}%{_localstatedir}/lib/openstack-swift-test -cp .unittests %{buildroot}%{_localstatedir}/lib/openstack-swift-test/unittests -cp .functests %{buildroot}%{_localstatedir}/lib/openstack-swift-test/functests -cp .probetests %{buildroot}%{_localstatedir}/lib/openstack-swift-test/probetests -cp -r test %{buildroot}%{_localstatedir}/lib/openstack-swift-test/ -ln -s %{python_sitelib}/swift %{buildroot}%{_localstatedir}/lib/openstack-swift-test/ +%openstack_test_package_install cp -r test-configs/* %{buildroot}/ -mv test/functional/sample.conf %{buildroot}%{_sysconfdir}/swift/func_test.conf - -mv %{buildroot}%{_bindir}/swift{,.old} +# For ./.unittests: +install -m 0644 test/sample.conf %{buildroot}%{_sysconfdir}/swift/test.conf +# For ./.functests: +ln -s %{_sysconfdir}/swift/test.conf %{buildroot}%{_sysconfdir}/swift/func_test.conf %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} @@ -358,7 +300,6 @@ %endif %dir %{_sysconfdir}/swift %dir %{_datadir}/openstack-swift -%{_bindir}/swift.old %{_bindir}/swift-account-audit %{_bindir}/swift-bench %{_bindir}/swift-dispersion-populate @@ -373,14 +314,15 @@ %{_bindir}/swift-recon-cron %{_bindir}/swift-ring-builder %{_bindir}/swift-temp-url -%{_mandir}/man8/st.8.gz -%{_mandir}/man8/swift-account-audit.8.gz -%{_mandir}/man8/swift-drive-audit.8.gz -%{_mandir}/man8/swift-get-nodes.8.gz -%{_mandir}/man8/swift-init.8.gz -%{_mandir}/man8/swift-ring-builder.8.gz -%{_mandir}/man8/swift-stats-populate.8.gz -%{_mandir}/man8/swift-stats-report.8.gz +%{_mandir}/man1/swift.1.gz +%{_mandir}/man1/swift-dispersion-populate.1.gz +%{_mandir}/man1/swift-dispersion-report.1.gz +%{_mandir}/man1/swift-get-nodes.1.gz +%{_mandir}/man1/swift-init.1.gz +%{_mandir}/man1/swift-orphans.1.gz +%{_mandir}/man1/swift-recon.1.gz +%{_mandir}/man1/swift-ring-builder.1.gz +%{_mandir}/man5/dispersion.conf.5.gz %files -n python-swift %defattr(-,root,root,-) @@ -401,13 +343,11 @@ %{_bindir}/swift-account-reaper %{_bindir}/swift-account-replicator %{_bindir}/swift-account-server -# TODO: check if this is the correct subpackage -#{_bindir}/swift-account-stats-logger -# ENDTODO -%{_mandir}/man8/swift-account-auditor.8.gz -%{_mandir}/man8/swift-account-reaper.8.gz -%{_mandir}/man8/swift-account-replicator.8.gz -%{_mandir}/man8/swift-account-server.8.gz +%{_mandir}/man1/swift-account-auditor.1.gz +%{_mandir}/man1/swift-account-reaper.1.gz +%{_mandir}/man1/swift-account-replicator.1.gz +%{_mandir}/man1/swift-account-server.1.gz +%{_mandir}/man5/account-server.conf.5.gz %files container %defattr(-,root,root,-) @@ -424,10 +364,12 @@ %{_bindir}/swift-container-updater %{_bindir}/swift-container-sync %{_bindir}/swift-cont-* -%{_mandir}/man8/swift-container-auditor.8.gz -%{_mandir}/man8/swift-container-server.8.gz -%{_mandir}/man8/swift-container-replicator.8.gz -%{_mandir}/man8/swift-container-updater.8.gz +%{_mandir}/man1/swift-container-auditor.1.gz +%{_mandir}/man1/swift-container-server.1.gz +%{_mandir}/man1/swift-container-sync.1.gz +%{_mandir}/man1/swift-container-replicator.1.gz +%{_mandir}/man1/swift-container-updater.1.gz +%{_mandir}/man5/container-server.conf.5.gz %files object %defattr(-,root,root,-) @@ -444,11 +386,14 @@ %{_bindir}/swift-object-replicator %{_bindir}/swift-object-server %{_bindir}/swift-object-updater -%{_mandir}/man8/swift-object-auditor.8.gz -%{_mandir}/man8/swift-object-info.8.gz -%{_mandir}/man8/swift-object-replicator.8.gz -%{_mandir}/man8/swift-object-server.8.gz -%{_mandir}/man8/swift-object-updater.8.gz +%{_mandir}/man1/swift-object-auditor.1.gz +%{_mandir}/man1/swift-object-expirer.1.gz +%{_mandir}/man1/swift-object-info.1.gz +%{_mandir}/man1/swift-object-replicator.1.gz +%{_mandir}/man1/swift-object-server.1.gz +%{_mandir}/man1/swift-object-updater.1.gz +%{_mandir}/man5/object-expirer.conf.5.gz +%{_mandir}/man5/object-server.conf.5.gz %files proxy %defattr(-,root,root,-) @@ -460,18 +405,17 @@ %endif %dir %{_sysconfdir}/swift/proxy-server %{_bindir}/swift-proxy-server -%{_mandir}/man8/swift-proxy-server.8.gz - -%if 0%{?with_doc} -%files doc -%defattr(-,root,root,-) -%doc LICENSE doc/build/html -%endif +%{_mandir}/man1/swift-proxy-server.1.gz +%{_mandir}/man5/proxy-server.conf.5.gz %files test %defattr(-,root,root) %dir %{_localstatedir}/lib/openstack-swift-test %{_localstatedir}/lib/openstack-swift-test/* +%{_localstatedir}/lib/openstack-swift-test/.functests +%{_localstatedir}/lib/openstack-swift-test/.probetests +%{_localstatedir}/lib/openstack-swift-test/.unittests +%{_sysconfdir}/swift/test.conf %{_sysconfdir}/swift/func_test.conf %{_sysconfdir}/swift/container-server/* %{_sysconfdir}/swift/object-server/* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -1,22 +1,9 @@ <services> - <service name="tar_scm" mode="disabled"> - <param name="url">git://github.com/openstack/swift.git</param> - <param name="scm">git</param> - <param name="exclude">.git</param> - <param name="exclude">.gitreview</param> - <param name="version">git-master</param> - <param name="versionformat">1.4.8+git.%ct.%h</param> - - <!-- Use this if you want a specific revision. --> - <param name="revision">stable/essex</param> - </service> - - <service name="recompress" mode="disabled"> - <param name="file">swift-*git*.tar</param> - <param name="compression">gz</param> - </service> - - <service name="set_version" mode="disabled"> - <param name="basename">swift</param> + <service name="github_tarballs" mode="disabled"> + <param name="url">http://tarballs.openstack.org/swift/swift-stable-folsom.tar.gz</param> + <param name="email">cloud-de...@suse.de</param> + <param name="repo_owner">openstack</param> + <param name="repo_name">swift</param> + <param name="target">stable/folsom</param> </service> </services> ++++++ openstack-swift-account-auditor.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-account-reaper.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-account-replicator.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-account.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-container-auditor.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift @@ -50,6 +49,8 @@ $0 start rc_status ;; + reload) + ;; status) echo -n "Checking $server" /sbin/checkproc /usr/bin/$server ++++++ openstack-swift-container-replicator.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-container-sync.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:58.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-container-updater.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-container.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-object-auditor.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-object-expirer.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-object-replicator.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-object-updater.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-object.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -25,7 +25,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift ++++++ openstack-swift-proxy.init ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -27,7 +27,6 @@ [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name" -lockfile="/var/lock/subsys/openstack-swift-$name" mkvarrun() { test -d /var/run/swift || mkdir /var/run/swift @@ -52,6 +51,8 @@ $0 start rc_status ;; + reload) + ;; status) echo -n "Checking $FULLNAME" /sbin/checkproc /usr/bin/$server ++++++ rpmlintrc ++++++ --- /var/tmp/diff_new_pack.h0RZMq/_old 2013-01-17 09:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h0RZMq/_new 2013-01-17 09:52:59.000000000 +0100 @@ -1,7 +1,9 @@ -#TODO: Fix this later on (i.e. SLE-12), Python on SLE-11 is way beyond broken: -addFilter("no-binary") # This symling is for the -test package and can be ignored: addFilter("dangling-symlink /var/lib/openstack-swift-test/swift") # Rpmlint gets this wrong, the subsys directories are fine but the variable # inside the init scripts contains shell variables: addFilter("incoherent-subsys /etc/init.d/openstack-swift") +# The following files are testsuite runners: +addFilter("hidden-file-or-dir /var/lib/openstack-swift-test/.functests") +addFilter("hidden-file-or-dir /var/lib/openstack-swift-test/.probetests") +addFilter("hidden-file-or-dir /var/lib/openstack-swift-test/.unittests") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
