Hello community, here is the log from the commit of package openstack-glance for openSUSE:Factory checked in at 2013-09-16 16:21:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-glance (Old) and /work/SRC/openSUSE:Factory/.openstack-glance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-glance" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes 2013-09-11 15:46:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes 2013-09-16 16:21:43.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Sep 15 00:16:07 UTC 2013 - [email protected] + +- Update to version 2013.2.a165.g4164949: + + Convert non-English exception message when a store loading error + +------------------------------------------------------------------- +Wed Sep 11 23:43:44 UTC 2013 - [email protected] + +- Update to version 2013.2.a163.g272a223: + + Fix typo in protected property message + + add missing index for 'owner' column on images table. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-glance-doc.spec ++++++ --- /var/tmp/diff_new_pack.PEYnU3/_old 2013-09-16 16:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.PEYnU3/_new 2013-09-16 16:21:43.000000000 +0200 @@ -19,7 +19,7 @@ %define component glance Name: openstack-%{component}-doc -Version: 2013.2.a160.g08987b1 +Version: 2013.2.a165.g4164949 Release: 0 Summary: OpenStack Image Service (Glance) - Documentation License: Apache-2.0 @@ -48,7 +48,7 @@ This package contains documentation files for openstack-glance. %prep -%setup -q -n glance-2013.2.a160.g08987b1 +%setup -q -n glance-2013.2.a165.g4164949 %openstack_cleanup_prep %build ++++++ openstack-glance.spec ++++++ --- /var/tmp/diff_new_pack.PEYnU3/_old 2013-09-16 16:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.PEYnU3/_new 2013-09-16 16:21:43.000000000 +0200 @@ -22,7 +22,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2013.2.a160.g08987b1 +Version: 2013.2.a165.g4164949 Release: 0 Summary: OpenStack Image Service (Glance) License: Apache-2.0 @@ -134,7 +134,7 @@ of OpenStack Glance. %prep -%setup -q -n glance-2013.2.a160.g08987b1 +%setup -q -n glance-2013.2.a165.g4164949 %patch2 -p1 %openstack_cleanup_prep sed -i "s|^#!.*||" tools/migrate_image_owners.py # Fix non-executable script warning ++++++ glance-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/AUTHORS new/glance-2013.2.a165.g4164949/AUTHORS --- old/glance-2013.2.a160.g08987b1/AUTHORS 2013-09-10 20:35:19.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/AUTHORS 2013-09-14 08:31:00.000000000 +0200 @@ -145,6 +145,7 @@ Unmesh Gurjar <[email protected]> Unmesh Gurjar <[email protected]> Venkatesh Sampath <[email protected]> +Venkatesh Sampath <[email protected]> Vincent Untz <[email protected]> Vishvananda Ishaya <[email protected]> Wayne A. Walls <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/ChangeLog new/glance-2013.2.a165.g4164949/ChangeLog --- old/glance-2013.2.a160.g08987b1/ChangeLog 2013-09-10 20:35:18.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/ChangeLog 2013-09-14 08:30:59.000000000 +0200 @@ -1,3 +1,27 @@ +commit 4164949ce6834314186d46e7c71d0a0631d60d45 +Merge: 272a223 71985de +Author: Jenkins <[email protected]> +Date: Sat Sep 14 06:28:35 2013 +0000 + + Merge "Convert non-English exception message when a store loading error" + +commit 272a223726fd059b023e3d9bfe9981b8c07f4955 +Merge: c0c1436 677d1b0 +Author: Jenkins <[email protected]> +Date: Wed Sep 11 22:55:00 2013 +0000 + + Merge "add missing index for 'owner' column on images table." + +commit c0c14368f41af4eb540a46c4bfd8a036a50e10ab +Author: Stuart McLaren <[email protected]> +Date: Wed Sep 11 13:07:22 2013 +0000 + + Fix typo in protected property message + + Fix for bug 1223861. + + Change-Id: Idad6143fcd587779b94cb155ffbe489759275265 + commit 08987b12eb5ba5e1e15977af26362180d72650c5 Author: Paul Bourke <[email protected]> Date: Tue Aug 27 16:39:41 2013 +0000 @@ -66,6 +90,27 @@ Merge "Fix localisation string usage" +commit 71985de2968b693805031a7134922d738c3d720e +Author: Zhi Yan Liu <[email protected]> +Date: Sat Aug 31 00:11:50 2013 +0800 + + Convert non-English exception message when a store loading error + + In non-English environment when a store driver loading failed then a + BackendException will be raised with a non-ascii message. So we need + convert + any coded exception message to unicode string for logging. + + This patch fixed a minor defect in + https://review.openstack.org/#/c/37421/ + And the test case has be enhanced also. + + Fixes bug 1202098 + + Related-Id: I9a58393b599aacc427cb4135988ecf5c3e90e455 + Change-Id: I1cdc71537fc1205e5fa4ff9744b441e5d88c1d04 + Signed-off-by: Zhi Yan Liu <[email protected]> + commit 10fdac6d618f25bd564696e11cb5058c6e1221de Merge: 3df62be ad6c535 Author: Jenkins <[email protected]> @@ -73,6 +118,16 @@ Merge "Add unit test for migration 012" +commit 677d1b07753a8c5c309d3992aaa4a1c8976ef2e5 +Author: Venkatesh Sampath <[email protected]> +Date: Wed Aug 21 15:22:32 2013 +0530 + + add missing index for 'owner' column on images table. + + Fixes bug 1214830 + + Change-Id: I13355cd53460188a5154aa3f50277c3e92335e28 + commit 3df62be5123be3ccabd24d89218717f5e5c1e749 Merge: 6d8cdc9 1837423 Author: Jenkins <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/PKG-INFO new/glance-2013.2.a165.g4164949/PKG-INFO --- old/glance-2013.2.a160.g08987b1/PKG-INFO 2013-09-10 20:35:19.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/PKG-INFO 2013-09-14 08:31:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: glance -Version: 2013.2.a160.g08987b1 +Version: 2013.2.a165.g4164949 Summary: OpenStack Image Service Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance/common/property_utils.py new/glance-2013.2.a165.g4164949/glance/common/property_utils.py --- old/glance-2013.2.a160.g08987b1/glance/common/property_utils.py 2013-09-10 20:32:38.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance/common/property_utils.py 2013-09-14 08:28:46.000000000 +0200 @@ -82,7 +82,7 @@ try: return re.compile(rule) except Exception as e: - msg = _("Encountered a malfored property protection rule %s:%s." + msg = _("Encountered a malformed property protection rule %s:%s." % (rule, e)) LOG.error(msg) raise webob.exc.HTTPInternalServerError(explanation=msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py new/glance-2013.2.a165.g4164949/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py --- old/glance-2013.2.a160.g08987b1/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py 1970-01-01 01:00:00.000000000 +0100 +++ new/glance-2013.2.a165.g4164949/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py 2013-09-14 08:28:46.000000000 +0200 @@ -0,0 +1,40 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2013 Rackspace Hosting +# All Rights Reserved. +# +# 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. + +from sqlalchemy import MetaData, Table, Index + +INDEX_NAME = 'owner_image_idx' + + +def upgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + images = Table('images', meta, autoload=True) + + index = Index(INDEX_NAME, images.c.owner) + index.create(migrate_engine) + + +def downgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + images = Table('images', meta, autoload=True) + + index = Index(INDEX_NAME, images.c.owner) + index.drop(migrate_engine) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance/db/sqlalchemy/models.py new/glance-2013.2.a165.g4164949/glance/db/sqlalchemy/models.py --- old/glance-2013.2.a160.g08987b1/glance/db/sqlalchemy/models.py 2013-09-10 20:32:38.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance/db/sqlalchemy/models.py 2013-09-14 08:28:46.000000000 +0200 @@ -109,7 +109,8 @@ __tablename__ = 'images' __table_args__ = (Index('checksum_image_idx', 'checksum'), Index('ix_images_is_public', 'is_public'), - Index('ix_images_deleted', 'deleted'),) + Index('ix_images_deleted', 'deleted'), + Index('owner_image_idx', 'owner'),) id = Column(String(36), primary_key=True, default=uuidutils.generate_uuid) name = Column(String(255)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance/store/base.py new/glance-2013.2.a165.g4164949/glance/store/base.py --- old/glance-2013.2.a160.g08987b1/glance/store/base.py 2013-09-10 20:32:38.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance/store/base.py 2013-09-14 08:28:46.000000000 +0200 @@ -27,16 +27,16 @@ LOG = logging.getLogger(__name__) -def _exception_to_str(exc): +def _exception_to_unicode(exc): try: - error = unicode(exc) + return unicode(exc) except UnicodeError: try: - error = str(exc) + return strutils.safe_decode(str(exc), errors='ignore') except UnicodeError: - error = (_("Caught '%(exception)s' exception.") % - {"exception": exc.__class__.__name__}) - return strutils.safe_encode(error, errors='ignore') + msg = (_("Caught '%(exception)s' exception.") % + {"exception": exc.__class__.__name__}) + return strutils.safe_decode(msg, errors='ignore') class Store(object): @@ -55,8 +55,8 @@ self.configure_add() except exception.BadStoreConfiguration as e: self.add = self.add_disabled - msg = (_("Failed to configure store correctly: %s " - "Disabling add method.") % _exception_to_str(e)) + msg = (_(u"Failed to configure store correctly: %s " + "Disabling add method.") % _exception_to_unicode(e)) LOG.warn(msg) def configure(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance/tests/unit/test_migrations.py new/glance-2013.2.a165.g4164949/glance/tests/unit/test_migrations.py --- old/glance-2013.2.a160.g08987b1/glance/tests/unit/test_migrations.py 2013-09-10 20:32:38.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance/tests/unit/test_migrations.py 2013-09-14 08:28:46.000000000 +0200 @@ -911,3 +911,27 @@ for idx in new_table.indexes] self.assertIn((index, columns), index_data) + + def _check_028(self, engine, data): + owner_index = "owner_image_idx" + columns = ["owner"] + + images_table = get_table(engine, 'images') + + index_data = [(idx.name, idx.columns.keys()) + for idx in images_table.indexes + if idx.name == owner_index] + + self.assertIn((owner_index, columns), index_data) + + def _post_downgrade_028(self, engine): + owner_index = "owner_image_idx" + columns = ["owner"] + + images_table = get_table(engine, 'images') + + index_data = [(idx.name, idx.columns.keys()) + for idx in images_table.indexes + if idx.name == owner_index] + + self.assertNotIn((owner_index, columns), index_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance/tests/unit/test_store_base.py new/glance-2013.2.a165.g4164949/glance/tests/unit/test_store_base.py --- old/glance-2013.2.a160.g08987b1/glance/tests/unit/test_store_base.py 2013-09-10 20:32:38.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance/tests/unit/test_store_base.py 2013-09-14 08:28:46.000000000 +0200 @@ -25,17 +25,23 @@ self.config(default_store='file') super(TestStoreBase, self).setUp() - def test_exception_to_str(self): + def test_exception_to_unicode(self): class FakeException(Exception): def __str__(self): raise UnicodeError() - ret = store_base._exception_to_str(Exception('error message')) + exc = Exception('error message') + ret = store_base._exception_to_unicode(exc) + self.assertEqual(unicode, type(ret)) self.assertEqual(ret, 'error message') - ret = store_base._exception_to_str(Exception('\xa5 error message')) + exc = Exception('\xa5 error message') + ret = store_base._exception_to_unicode(exc) + self.assertEqual(unicode, type(ret)) self.assertEqual(ret, ' error message') - ret = store_base._exception_to_str(FakeException('\xa5 error message')) + exc = FakeException('\xa5 error message') + ret = store_base._exception_to_unicode(exc) + self.assertEqual(unicode, type(ret)) self.assertEqual(ret, _("Caught '%(exception)s' exception.") % {'exception': 'FakeException'}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance.egg-info/PKG-INFO new/glance-2013.2.a165.g4164949/glance.egg-info/PKG-INFO --- old/glance-2013.2.a160.g08987b1/glance.egg-info/PKG-INFO 2013-09-10 20:35:19.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance.egg-info/PKG-INFO 2013-09-14 08:31:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: glance -Version: 2013.2.a160.g08987b1 +Version: 2013.2.a165.g4164949 Summary: OpenStack Image Service Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.a160.g08987b1/glance.egg-info/SOURCES.txt new/glance-2013.2.a165.g4164949/glance.egg-info/SOURCES.txt --- old/glance-2013.2.a160.g08987b1/glance.egg-info/SOURCES.txt 2013-09-10 20:35:19.000000000 +0200 +++ new/glance-2013.2.a165.g4164949/glance.egg-info/SOURCES.txt 2013-09-14 08:31:00.000000000 +0200 @@ -162,6 +162,7 @@ glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py +glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py glance/db/sqlalchemy/migrate_repo/versions/__init__.py glance/domain/__init__.py glance/domain/proxy.py -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
