Merge lp:~smartboyhw/wubi/bug-1080090 into lp:wubi

[Howard Chan]

Changed code in distro.py to not replace hyphens with spaces (LP: #1080090)

== Background ==

bcbc reported that when he tries out the code to install Ubuntu Studio into Wubi, he received a dialog telling him that it still didn't match the data in /.disk/info. However I checked the name in isolist.ini and it is correct. So I decided to report a bug (LP: #1080090) to track the bug/problem.

== Issues ==
It turns out in /src/wubi/backend/common/distro.py line 191
name = info.group('name').replace("-", " ")
that it replaces hyphens with spaces.
The original correct name "Ubuntu-Studio" turns into "Ubuntu Studio", which then does not fit the data in .disk/info

== Changed code ==

I went to delete the .replace("-", " ") and also added the example of Ubuntu-Studio ISO .disk/info into it so that people know why I changed the code to not replace hyphens with spaces.

BTW this code doesn't affect other distros, since that only our distro has two words in our distro name.

[Colin Watson (cjwatson)]

OK, but on the understanding that this is a temporary hack and that it should be reverted as soon as the underlying problems are fixed. I'll add a comment to that effect.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-16 14:31:12 +0000
+++ debian/changelog	2012-11-17 15:01:19 +0000
@@ -6,7 +6,11 @@
   [ Colin Watson ]
   * Bump to 13.04.
 
- -- Howard Chan <[e-mail]>  Thu, 15 Nov 2012 19:48:09 +0800
+  [ Howard Chan ]
+  * Changed code in /src/wubi/backends/common/distro.py to make Wubi not
+    replacing the correct distro name with the wrong one (LP: #1080090)  
+
+ -- Howard Chan <[e-mail]>  Sat, 17 Nov 2012 22:48:01 +0800
 
 wubi (12.10) quantal; urgency=low
 

=== modified file 'src/wubi/backends/common/distro.py'
--- src/wubi/backends/common/distro.py	2012-04-24 15:57:38 +0000
+++ src/wubi/backends/common/distro.py	2012-11-17 15:01:19 +0000
@@ -182,12 +182,13 @@
         Ubuntu 9.04 "Jaunty Jackalope" - Alpha i386 (20090106)
         Ubuntu 9.04 "Jaunty Jackalope" - Alpha i386 (20090106.1)
         Ubuntu Split Name 9.04.1 "Jaunty Jackalope" - Final Release i386 (20090106.2)
+        Ubuntu-Studio 12.10 "Quantal Quetzal" - Release amd64 (20121017.1)
         '''
         log.debug("  parsing info from str=%s" % info)
         if not info:
             return
         info = disk_info_re.match(info)
-        name = info.group('name').replace('-', ' ')
+        name = info.group('name')
         version = info.group('version')
         subversion = info.group('subversion')
         arch = info.group('arch')