Your message dated Thu, 07 Feb 2013 13:59:24 +0000
with message-id <[email protected]>
and subject line Re: Bug#700006: Fix for bug #699906: python-django-horizon:
"Launch from volume" broken
has caused the Debian Bug report #700006,
regarding unblock: horizon/2012.1.1-10
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
700006: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700006
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Hi,
I would like to upload a fix for:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699906
The diff file is attached. If the release team thinks it is suitable for
Wheezy, please let me know, and I will upload, rename this bug and tag
accordingly.
Cheers,
Thomas Goirand (zigo)
diff -Nru horizon-2012.1.1/debian/changelog horizon-2012.1.1/debian/changelog
--- horizon-2012.1.1/debian/changelog 2012-11-18 23:10:33.000000000 +0800
+++ horizon-2012.1.1/debian/changelog 2013-02-07 17:59:58.000000000 +0800
@@ -1,3 +1,10 @@
+horizon (2012.1.1-10) unstable; urgency=low
+
+ * Added patch: Launch from volume with valid volume size. Thanks to Julien
+ Cristau <[email protected]> for reporting (Closes: 699906).
+
+ -- Thomas Goirand <[email protected]> Thu, 07 Feb 2013 17:50:55 +0800
+
horizon (2012.1.1-9) unstable; urgency=high
* Re-uploading with urgency=high.
diff -Nru horizon-2012.1.1/debian/patches/launch-from-volume-with-valid-volume-size.patch horizon-2012.1.1/debian/patches/launch-from-volume-with-valid-volume-size.patch
--- horizon-2012.1.1/debian/patches/launch-from-volume-with-valid-volume-size.patch 1970-01-01 08:00:00.000000000 +0800
+++ horizon-2012.1.1/debian/patches/launch-from-volume-with-valid-volume-size.patch 2013-02-07 17:59:58.000000000 +0800
@@ -0,0 +1,72 @@
+Description: Launch from volume with valid volume size
+Author: Sascha Peilicke <[email protected]>
+Origin: upstream, https://review.openstack.org/gitweb?p=openstack/horizon.git;a=patch;h=fd2291bd28a5a4331d9a7baf961c76effd17b85a
+Bug-Debian: http://bugs.debian.org/699906
+Bug-Ubuntu: https://launchpad.net/bugs/1047568
+Date: 2012-10-18
+
+diff --git a/AUTHORS b/AUTHORS
+index 4110431..677253f 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -41,6 +41,7 @@ Monty Taylor <[email protected]>
+ Neil Johnston <[email protected]>
+ Paul McMillan <[email protected]>
+ Sam Morrison <[email protected]>
++Sascha Peilicke <[email protected]>
+ Stephane Angot <[email protected]>
+ termie <[email protected]>
+ Thierry Carrez <[email protected]>
+diff --git a/horizon/dashboards/nova/images_and_snapshots/images/forms.py b/horizon/dashboards/nova/images_and_snapshots/images/forms.py
+index bc4851d..a6cdbad 100644
+--- a/horizon/dashboards/nova/images_and_snapshots/images/forms.py
++++ b/horizon/dashboards/nova/images_and_snapshots/images/forms.py
+@@ -164,7 +164,7 @@ class LaunchForm(forms.SelfHandlingForm):
+ else:
+ delete_on_terminate = 0
+ dev_mapping = {data['device_name']:
+- ("%s::%s" % (data['volume'], delete_on_terminate))}
++ ("%s:%s" % (data['volume'], delete_on_terminate))}
+ else:
+ dev_mapping = None
+
+diff --git a/horizon/dashboards/nova/images_and_snapshots/images/tests.py b/horizon/dashboards/nova/images_and_snapshots/images/tests.py
+index aa02325..3615288 100644
+--- a/horizon/dashboards/nova/images_and_snapshots/images/tests.py
++++ b/horizon/dashboards/nova/images_and_snapshots/images/tests.py
+@@ -118,8 +118,8 @@ class ImageViewTests(test.TestCase):
+ sec_group = self.security_groups.first()
+ USER_DATA = 'user data'
+ device_name = u'vda'
+- volume_choice = "%s:vol" % volume.id
+- block_device_mapping = {device_name: u"%s::0" % volume_choice}
++ volume_choice = "%s:vol:%s" % (volume.id, volume.size)
++ block_device_mapping = {device_name: u"%s:0" % volume_choice}
+
+ self.mox.StubOutWithMock(api, 'image_get_meta')
+ self.mox.StubOutWithMock(api, 'flavor_list')
+@@ -269,7 +269,7 @@ class ImageViewTests(test.TestCase):
+ sec_group = self.security_groups.first()
+ USER_DATA = 'user data'
+ device_name = u'vda'
+- volume_choice = "%s:vol" % volume.id
++ volume_choice = "%s:vol:%s" % (volume.id, volume.size)
+
+ self.mox.StubOutWithMock(api, 'image_get_meta')
+ self.mox.StubOutWithMock(api, 'flavor_list')
+diff --git a/horizon/dashboards/nova/images_and_snapshots/images/views.py b/horizon/dashboards/nova/images_and_snapshots/images/views.py
+index 1803f97..0b6ec5c 100644
+--- a/horizon/dashboards/nova/images_and_snapshots/images/views.py
++++ b/horizon/dashboards/nova/images_and_snapshots/images/views.py
+@@ -117,7 +117,7 @@ class LaunchView(forms.ModalFormView):
+ else:
+ vol_type = "vol"
+ visible_label = _("Volume")
+- return (("%s:%s" % (volume.id, vol_type)),
++ return (("%s:%s:%s" % (volume.id, vol_type, volume.size)),
+ ("%s - %s GB (%s)" % (volume.display_name,
+ volume.size,
+ visible_label)))
+--
+1.7.9.5
+
diff -Nru horizon-2012.1.1/debian/patches/series horizon-2012.1.1/debian/patches/series
--- horizon-2012.1.1/debian/patches/series 2012-11-18 23:10:33.000000000 +0800
+++ horizon-2012.1.1/debian/patches/series 2013-02-07 17:59:58.000000000 +0800
@@ -1,2 +1,3 @@
CVE-2012-3540_disallow_login_redirect_other_than_same_origin.patch
keyerror-688254.patch
+launch-from-volume-with-valid-volume-size.patch
--- End Message ---
--- Begin Message ---
On 2013-02-07 13:35, Thomas Goirand wrote:
On 02/07/2013 07:45 PM, Jonathan Wiltshire wrote:
The diff looks fine in principle, let's see how it gets on in sid.
Thanks,
Uploaded. Release team bug retitled and usertaged accordingly.
Thanks.
Thomas
Thanks, unblocked.
--
Jonathan Wiltshire [email protected]
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
<directhex> i have six years of solaris sysadmin experience, from
8->10. i am well qualified to say it is made from bonghits
layered on top of bonghits
--- End Message ---
