Hello community, here is the log from the commit of package openstack-glance for openSUSE:Factory checked in at 2013-01-30 11:17:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-glance (Old) and /work/SRC/openSUSE:Factory/.openstack-glance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-glance", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes 2013-01-24 10:45:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes 2013-01-30 11:17:48.000000000 +0100 @@ -0,0 +1,7 @@ +-------------------------------------------------------------------- +Wed Jan 30 07:08:50 UTC 2013 - [email protected] + +- Update to version 2012.2.3+git.1359529730.a5b0f4e: + + Change useexisting to extend_existing to fix deprecation warnings. + + Remove Swift location/password from messages. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-glance-doc.spec ++++++ --- /var/tmp/diff_new_pack.taIdXF/_old 2013-01-30 11:17:50.000000000 +0100 +++ /var/tmp/diff_new_pack.taIdXF/_new 2013-01-30 11:17:50.000000000 +0100 @@ -19,7 +19,7 @@ %define component glance Name: openstack-%{component}-doc -Version: 2012.2.3+git.1358435434.fd04efb +Version: 2012.2.3+git.1359529730.a5b0f4e Release: 1 License: Apache-2.0 Summary: OpenStack Image Service (Glance) - Documentation ++++++ openstack-glance.spec ++++++ --- /var/tmp/diff_new_pack.taIdXF/_old 2013-01-30 11:17:50.000000000 +0100 +++ /var/tmp/diff_new_pack.taIdXF/_new 2013-01-30 11:17:50.000000000 +0100 @@ -22,7 +22,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2012.2.3+git.1358435434.fd04efb +Version: 2012.2.3+git.1359529730.a5b0f4e Release: 1 License: Apache-2.0 Summary: OpenStack Image Service (Glance) ++++++ glance-stable-folsom.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/AUTHORS new/glance-2012.2.3/AUTHORS --- old/glance-2012.2.3/AUTHORS 2013-01-16 18:45:44.000000000 +0100 +++ new/glance-2012.2.3/AUTHORS 2013-01-29 17:12:59.000000000 +0100 @@ -19,6 +19,7 @@ Clark Boylan <[email protected]> Cory Wright <[email protected]> Dan Prince <[email protected]> +David Ripton <[email protected]> Dean Troyer <[email protected]> Derek Higgins <[email protected]> Donal Lafferty <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/ChangeLog new/glance-2012.2.3/ChangeLog --- old/glance-2012.2.3/ChangeLog 2013-01-16 18:45:44.000000000 +0100 +++ new/glance-2012.2.3/ChangeLog 2013-01-29 17:12:59.000000000 +0100 @@ -1,3 +1,56 @@ +commit a5b0f4eb81a1f5d8e89713ff7b3ccc6155762628 +Merge: 0e4e7a7 96a470b +Author: Jenkins <[email protected]> +Date: Tue Jan 29 15:57:58 2013 +0000 + + Merge "Remove Swift location/password from messages." into stable/folsom + +commit 0e4e7a7312cf9b49f4e8e200341e65e2394990ac +Merge: fd04efb 4c96080 +Author: Jenkins <[email protected]> +Date: Fri Jan 25 17:55:20 2013 +0000 + + Merge "Change useexisting to extend_existing to fix deprecation warnings." into stable/folsom + +commit 4c96080375553f5ffaaaa4b1470160464bcfb910 +Author: David Ripton <[email protected]> +Date: Mon Oct 8 15:24:45 2012 -0400 + + Change useexisting to extend_existing to fix deprecation warnings. + + This squelches a deprecation warning during installation. + + We're already using extend_existing in other places, so I don't + think this causes any new version compatibility issues. + + Fixes bug 925609. (Already marked fixed, but this hits more cases.) + + Includes some merges with a whitespace-cleanup fix. + + Change-Id: Ia166e9184ed3e13753c5669a1006a3711738319a + + .../migrate_repo/versions/003_add_disk_format.py | 2 +- + .../migrate_repo/versions/005_size_big_integer.py | 2 +- + .../migrate_repo/versions/006_key_to_name.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 96a470be64adcef97f235ca96ed3c59ed954a4c1 +Author: Dan Prince <[email protected]> +Date: Sat Jan 12 15:38:09 2013 -0500 + + Remove Swift location/password from messages. + + Updates several exceptions and log messages in the Swift backend + so that they don't include Swift location URI's which may contain + passwords when used in Swift single tenant mode. + + Fixes LP Bug #1098962 (for Folsom). + + Change-Id: Ia97a95ce6ed5d98a76515eea8817e309bcf0889a + + glance/store/swift.py | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + commit fd04efb679a4521a2105ecb6645e40a60dfa3aeb Merge: 3c56950 bca6e26 Author: Jenkins <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py new/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py --- old/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py 2013-01-16 18:41:39.000000000 +0100 +++ new/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py 2013-01-29 17:09:35.000000000 +0100 @@ -43,7 +43,7 @@ Column('deleted', Boolean(), nullable=False, default=False, index=True), mysql_engine='InnoDB', - useexisting=True) + extend_existing=True) return images diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py new/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py --- old/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py 2013-01-16 18:41:39.000000000 +0100 +++ new/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py 2013-01-29 17:09:35.000000000 +0100 @@ -44,7 +44,7 @@ Column('deleted', Boolean(), nullable=False, default=False, index=True), mysql_engine='InnoDB', - useexisting=True) + extend_existing=True) return images diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py new/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py --- old/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py 2013-01-16 18:41:39.000000000 +0100 +++ new/glance-2012.2.3/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py 2013-01-29 17:09:35.000000000 +0100 @@ -56,7 +56,7 @@ index=True), UniqueConstraint('image_id', 'name'), mysql_engine='InnoDB', - useexisting=True) + extend_existing=True) return image_properties diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/glance/store/swift.py new/glance-2012.2.3/glance/store/swift.py --- old/glance-2012.2.3/glance/store/swift.py 2013-01-16 18:41:39.000000000 +0100 +++ new/glance-2012.2.3/glance/store/swift.py 2013-01-29 17:09:35.000000000 +0100 @@ -136,7 +136,7 @@ "like so: " "swift+http://user:[email protected]/v1/container/obj"; ) - LOG.error(_("Invalid store uri %(uri)s: %(reason)s") % locals()) + LOG.error(_("Invalid store URI: %(reason)s") % locals()) raise exception.BadStoreUri(message=reason) pieces = urlparse.urlparse(uri) @@ -162,8 +162,7 @@ if creds: cred_parts = creds.split(':') if len(cred_parts) != 2: - reason = (_("Badly formed credentials '%(creds)s' in Swift " - "URI") % locals()) + reason = (_("Badly formed credentials in Swift URI.")) LOG.error(reason) raise exception.BadStoreUri() user, key = cred_parts @@ -181,7 +180,7 @@ path_parts.insert(0, netloc) self.auth_or_store_url = '/'.join(path_parts) except IndexError: - reason = _("Badly formed Swift URI: %s") % uri + reason = _("Badly formed Swift URI.") LOG.error(reason) raise exception.BadStoreUri() @@ -293,8 +292,8 @@ except swiftclient.ClientException, e: if e.http_status == httplib.NOT_FOUND: uri = location.get_store_uri() - raise exception.NotFound(_("Swift could not find image at " - "uri %(uri)s") % locals()) + msg = _("Swift could not find image at URI.") + raise exception.NotFound(msg) else: raise @@ -543,7 +542,7 @@ except swiftclient.ClientException, e: if e.http_status == httplib.CONFLICT: raise exception.Duplicate(_("Swift already has an image at " - "location %s") % location.get_uri()) + "this location.")) msg = (_("Failed to add object to Swift.\n" "Got error from Swift: %(e)s") % locals()) LOG.error(msg) @@ -596,8 +595,8 @@ except swiftclient.ClientException, e: if e.http_status == httplib.NOT_FOUND: uri = location.get_store_uri() - raise exception.NotFound(_("Swift could not find image at " - "uri %(uri)s") % locals()) + msg = _("Swift could not find image at URI.") + raise exception.NotFound(msg) else: raise @@ -637,8 +636,8 @@ except swiftclient.ClientException, e: if e.http_status == httplib.NOT_FOUND: uri = location.get_store_uri() - raise exception.NotFound(_("Swift could not find image at " - "uri %(uri)s") % locals()) + msg = _("Swift could not find image at URI.") + raise exception.NotFound(msg) else: raise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2012.2.3/glance/versioninfo new/glance-2012.2.3/glance/versioninfo --- old/glance-2012.2.3/glance/versioninfo 2013-01-16 18:45:42.000000000 +0100 +++ new/glance-2012.2.3/glance/versioninfo 2013-01-29 17:12:58.000000000 +0100 @@ -1 +1 @@ -2012.2.3~20130116.7.gfd04efb +2012.2.3~20130129.11.ga5b0f4e -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
