Hello community, here is the log from the commit of package openstack-swift for openSUSE:Factory checked in at 2013-10-02 13:31:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-swift (Old) and /work/SRC/openSUSE:Factory/.openstack-swift.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-swift" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-swift/openstack-swift.changes 2013-09-27 17:55:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift.changes 2013-10-02 13:31:51.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Oct 1 00:39:41 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 1.9.2.180.g5eea524+git.1380587981.5eea524: + + bulk delete bug with trailing whitespace + +-------------------------------------------------------------------- +Sun Sep 29 00:42:23 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 1.9.2.178.g9befc70+git.1380415343.9befc70: + + Install libffi-dev in SAIO docs. + + improve bulk document + +------------------------------------------------------------------- +Fri Sep 27 16:22:46 UTC 2013 - dmueller@suse.com + +- switch to crudini + +-------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-swift-doc.spec ++++++ --- /var/tmp/diff_new_pack.ceOLWr/_old 2013-10-02 13:31:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ceOLWr/_new 2013-10-02 13:31:52.000000000 +0200 @@ -19,7 +19,7 @@ %define component swift Name: openstack-%{component}-doc -Version: 1.9.2.175.gc1f9f66+git.1380213982.c1f9f66 +Version: 1.9.2.180.g5eea524+git.1380587981.5eea524 Release: 0 Summary: OpenStack Storage (Swift) - Documentation License: Apache-2.0 @@ -47,7 +47,7 @@ This package contains documentation files for openstack-swift. %prep -%setup -q -n swift-1.9.2.175.gc1f9f66 +%setup -q -n swift-1.9.2.180.g5eea524 sed -i "s/\r//" LICENSE # Fix wrong-file-end-of-line-encoding warning %openstack_cleanup_prep ++++++ openstack-swift.spec ++++++ --- /var/tmp/diff_new_pack.ceOLWr/_old 2013-10-02 13:31:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ceOLWr/_new 2013-10-02 13:31:52.000000000 +0200 @@ -21,7 +21,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 1.9.2.175.gc1f9f66+git.1380213982.c1f9f66 +Version: 1.9.2.180.g5eea524+git.1380587981.5eea524 Release: 0 Summary: OpenStack Storage (Swift) License: Apache-2.0 @@ -46,9 +46,9 @@ Source16: %{name}-proxy.init Source21: swift-test-configs-0.0.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros -BuildRequires: openstack-utils BuildRequires: python-d2to1 BuildRequires: python-devel BuildRequires: python-distribute @@ -171,7 +171,7 @@ of OpenStack Swift. %prep -%setup -q -n swift-1.9.2.175.gc1f9f66 +%setup -q -n swift-1.9.2.180.g5eea524 sed -i "s/\r//" LICENSE # Fix wrong-file-end-of-line-encoding warning tar xvf %{SOURCE21} %openstack_cleanup_prep @@ -227,7 +227,7 @@ object-expirer object-server proxy-server \ swift; do install -m 644 etc/$c.conf-sample %{buildroot}%{_sysconfdir}/swift/$c.conf - openstack-config --set %{buildroot}%{_sysconfdir}/swift/$c.conf DEFAULT user %{username} + crudini --set %{buildroot}%{_sysconfdir}/swift/$c.conf DEFAULT user %{username} done # /var/run is not allowed in 11.3 or later because of tmpfs support ++++++ swift-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swift-1.9.2.175.gc1f9f66/PKG-INFO new/swift-1.9.2.180.g5eea524/PKG-INFO --- old/swift-1.9.2.175.gc1f9f66/PKG-INFO 2013-09-26 02:29:46.000000000 +0200 +++ new/swift-1.9.2.180.g5eea524/PKG-INFO 2013-09-29 05:15:53.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: swift -Version: 1.9.2.175.gc1f9f66 +Version: 1.9.2.180.g5eea524 Summary: OpenStack Object Storage Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swift-1.9.2.175.gc1f9f66/doc/source/development_saio.rst new/swift-1.9.2.180.g5eea524/doc/source/development_saio.rst --- old/swift-1.9.2.175.gc1f9f66/doc/source/development_saio.rst 2013-09-26 02:29:13.000000000 +0200 +++ new/swift-1.9.2.180.g5eea524/doc/source/development_saio.rst 2013-09-29 05:15:24.000000000 +0200 @@ -35,14 +35,14 @@ * On apt based systems, #. `apt-get update` - #. `apt-get install curl gcc memcached rsync sqlite3 xfsprogs git-core python-setuptools` + #. `apt-get install curl gcc memcached rsync sqlite3 xfsprogs git-core libffi-dev python-setuptools` #. `apt-get install python-coverage python-dev python-nose python-simplejson python-xattr python-eventlet python-greenlet python-pastedeploy python-netifaces python-pip python-dnspython python-mock` * On yum based systems, - #. `yum install curl gcc memcached rsync sqlite xfsprogs git-core xinetd python-setuptools` + #. `yum install curl gcc memcached rsync sqlite xfsprogs git-core libffi-devel xinetd python-setuptools` #. `yum install python-coverage python-devel python-nose python-simplejson python-xattr python-eventlet python-greenlet python-pastedeploy python-netifaces python-pip python-dnspython python-mock` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swift-1.9.2.175.gc1f9f66/swift/common/middleware/bulk.py new/swift-1.9.2.180.g5eea524/swift/common/middleware/bulk.py --- old/swift-1.9.2.175.gc1f9f66/swift/common/middleware/bulk.py 2013-09-26 02:29:13.000000000 +0200 +++ new/swift-1.9.2.180.g5eea524/swift/common/middleware/bulk.py 2013-09-29 05:15:24.000000000 +0200 @@ -144,11 +144,11 @@ Will delete multiple objects or containers from their account with a single request. Responds to DELETE requests with query parameter - ?bulk-delete set. The Content-Type should be set to text/plain. - The body of the DELETE request will be a newline separated list of url - encoded objects to delete. You can delete 10,000 (configurable) objects - per request. The objects specified in the DELETE request body must be URL - encoded and in the form: + ?bulk-delete set. The request url is your storage url. The Content-Type + should be set to text/plain. The body of the DELETE request will be a + newline separated list of url encoded objects to delete. You can delete + 10,000 (configurable) objects per request. The objects specified in the + DELETE request body must be URL encoded and in the form: /container_name/obj_name @@ -241,6 +241,7 @@ while data_remaining: if '\n' in line: obj_to_delete, line = line.split('\n', 1) + obj_to_delete = obj_to_delete.strip() objs_to_delete.append( {'name': unquote(obj_to_delete)}) else: @@ -249,9 +250,10 @@ line += data else: data_remaining = False - if line.strip(): + obj_to_delete = line.strip() + if obj_to_delete: objs_to_delete.append( - {'name': unquote(line)}) + {'name': unquote(obj_to_delete)}) if len(objs_to_delete) > self.max_deletes_per_request: raise HTTPRequestEntityTooLarge( 'Maximum Bulk Deletes: %d per request' % @@ -308,7 +310,7 @@ separator = '\r\n\r\n' last_yield = time() yield ' ' - obj_name = obj_to_delete['name'].strip() + obj_name = obj_to_delete['name'] if not obj_name: continue if len(failed_files) >= self.max_failed_deletes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swift-1.9.2.175.gc1f9f66/swift.egg-info/PKG-INFO new/swift-1.9.2.180.g5eea524/swift.egg-info/PKG-INFO --- old/swift-1.9.2.175.gc1f9f66/swift.egg-info/PKG-INFO 2013-09-26 02:29:46.000000000 +0200 +++ new/swift-1.9.2.180.g5eea524/swift.egg-info/PKG-INFO 2013-09-29 05:15:53.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: swift -Version: 1.9.2.175.gc1f9f66 +Version: 1.9.2.180.g5eea524 Summary: OpenStack Object Storage Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swift-1.9.2.175.gc1f9f66/test/unit/common/middleware/test_bulk.py new/swift-1.9.2.180.g5eea524/test/unit/common/middleware/test_bulk.py --- old/swift-1.9.2.175.gc1f9f66/test/unit/common/middleware/test_bulk.py 2013-09-26 02:29:13.000000000 +0200 +++ new/swift-1.9.2.180.g5eea524/test/unit/common/middleware/test_bulk.py 2013-09-29 05:15:24.000000000 +0200 @@ -553,18 +553,18 @@ req.method = 'DELETE' req.headers['Transfer-Encoding'] = 'chunked' req.headers['Accept'] = 'application/json' - req.environ['wsgi.input'] = StringIO('/c/f') + req.environ['wsgi.input'] = StringIO('/c/f%20') list(self.bulk(req.environ, fake_start_response)) # iterate over resp self.assertEquals( - self.app.delete_paths, ['/delete_works/AUTH_Acc/c/f']) + self.app.delete_paths, ['/delete_works/AUTH_Acc/c/f ']) self.assertEquals(self.app.calls, 1) def test_bulk_delete_get_objs(self): - req = Request.blank('/delete_works/AUTH_Acc', body='1\r\n2\r\n') + req = Request.blank('/delete_works/AUTH_Acc', body='1%20\r\n2\r\n') req.method = 'DELETE' with patch.object(self.bulk, 'max_deletes_per_request', 2): results = self.bulk.get_objs_to_delete(req) - self.assertEquals(results, [{'name': '1\r'}, {'name': '2\r'}]) + self.assertEquals(results, [{'name': '1 '}, {'name': '2'}]) with patch.object(bulk, 'MAX_PATH_LENGTH', 2): results = [] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org