Merge lp:~f.zweig/ubuntu/maverick/guake/guake-fix-650928 into lp:ubuntu/maverick/guake

[Felix Zweig]

Retrieve secure proxy port as int (LP: #650928)

A naive try to fix bug #650928. :)

[lp:~f.zweig/ubuntu/maverick/guake/guake-fix-650928]

14. By Felix Zweig on 2010-11-04

correct change owner :)

[Stefano Rivera (stefanor)]

-guake (0.4.2-2ubuntu1) maverick; urgency=low
+guake (0.4.2-1) unstable; urgency=low

Err, why?

At what point did this change from a string to an int? Well, my real question is: Will some users still have strings, do you have to touch your proxy settings to get it to become an int? If so, the Redhat patch is preferable.

Also, note that as this is an SRU, it should have an SRU version number, i.e. 0.4.2-2ubuntu1.1 and be aimed at maverick-proposed, not maverick. https://wiki.ubuntu.com/StableReleaseUpdates

We usually prefer to fix bugs like this in the development release before the stable one (so we don't provide an update that causes regressions), but in this case it can probably just be done as an SRU.

review: Needs Fixing

[Felix Zweig (f.zweig)]

Thank you for your comment, I really appreciate it. However, I can't see how a port number would be a string. GNOME's proxy settings only allow for an Integer, and I'm not able to find a correct scenario why one would have setup a string.

And how can I target "development" from a "stable" installation? Thank you!

[Stefano Rivera (stefanor)]

Sorry for delayed reply.

I was assuming that in the past it stored as a string and now it's stored as an integer. Therefore old, existing settings may still be strings. However, this is an assumption, it'd need some research.

Redhat seem to have had the same assumption: https://bugzilla.redhat.com/attachment.cgi?id=440308&action=diff

As to targetting development Ubuntu from a stable release. I recommend you install it in a VM / spare machine / dual boot for live testing, but you can get pretty far building with PBuilder / Launchpad PPAs.

https://wiki.ubuntu.com/PbuilderHowto

Unmerged revisions

14. By Felix Zweig on 2010-11-04

correct change owner :)

13. By Felix Zweig on 2010-11-04

Retrieve secure proxy port as int (LP: #650928)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-21 19:43:51 +0000
+++ debian/changelog	2010-11-04 17:58:41 +0000
@@ -1,4 +1,10 @@
-guake (0.4.2-2ubuntu1) maverick; urgency=low
+guake (0.4.2-2ubuntu2) maverick; urgency=low
+
+  * Retrieve secure proxy port as int (LP: #650928)
+
+ -- Felix Zweig <[e-mail]>  Thu, 4 Nov 2010 18:55:43 +0100
+
+guake (0.4.2-1) unstable; urgency=low
 
   * New versions did not provided the TERM variable (LP: #621927)
 

=== modified file 'src/guake.py'
--- src/guake.py	2010-07-31 01:16:57 +0000
+++ src/guake.py	2010-11-04 17:58:41 +0000
@@ -1099,7 +1099,7 @@
                 ssl_port = port
             else:
                 ssl_host = self.client.get_string('/system/proxy/secure_host')
-                ssl_port = self.client.get_string('/system/proxy/secure_port')
+                ssl_port = self.client.get_int('/system/proxy/secure_port')
 
             if self.client.get_bool(proxy + 'use_authentication'):
                 auth_user = self.client.get_string(