Merge lp:~bcbc/wubi/lp-882393 into lp:wubi

[bcbc]

Don't use the diskimage download when the target partition is FAT32 (LP: #882392)

When the target drive is FAT32, don't use the diskimage download which fails. Instead download the desktop CD ISO. Tested by running standalone wubi.exe, first installing to an NTFS partition and it starts to download the tar.xz diskimage. When I select a FAT32 drive it instead downloads the desktop CD ISO.

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 16:32:10 +0000
+++ debian/changelog	2012-02-25 07:06:17 +0000
@@ -1,5 +1,19 @@
 wubi (12.04) UNRELEASED; urgency=low
 
+  [ bcbc ]
+  * Don't use the diskimage download when the target 
+    partition is FAT32 (LP: #882393).
+
+  [ bcbc ]
+  * Correct NameError exceptions on missing attributes
+    when running CD boot helper or a CD is rejected (LP: #876154).
+  * Ignore Permission denied when copying wubildr everywhere
+    (LP: #862003)
+  * Don't fail if Windows' startup folder is missing or mis-
+    configured (LP: #910948)
+  * If bcdedit fails when uninstalling, it shouldn't be fatal
+    (LP: #925779)
+
   [ Evan Dandrea ]
   * Remove partially downloaded files that Windows does not consider
     files when the bit torrent tracker falls over (LP: #873268).

=== modified file 'src/wubi/backends/common/backend.py'
--- src/wubi/backends/common/backend.py	2012-02-01 16:32:10 +0000
+++ src/wubi/backends/common/backend.py	2012-02-25 07:06:17 +0000
@@ -75,7 +75,8 @@
     def get_installation_tasklist(self):
         self.cache_cd_path()
         dimage = self.info.distro.diskimage
-        if dimage and not self.cd_path and not self.iso_path:
+        # don't use diskimage for a FAT32 target directory
+        if dimage and not self.cd_path and not self.iso_path and not self.info.target_drive.is_fat():
             tasks = [
             Task(self.select_target_dir,
                  description=_("Selecting the target directory")),
@@ -120,6 +121,7 @@
         return tasklist
 
     def get_cdboot_tasklist(self):
+        self.cache_cd_path()
         tasks = [
             Task(self.select_target_dir, description=_("Selecting the target directory")),
             Task(self.create_dir_structure, description=_("Creating the installation directories")),
@@ -345,6 +347,7 @@
         return urls
 
     def cache_cd_path(self):
+        self.iso_path = None
         self.cd_path = None
         if self.info.cd_distro \
         and self.info.distro == self.info.cd_distro \
@@ -355,7 +358,6 @@
             self.cd_path = self.find_cd()
 
         if not self.cd_path:
-            self.iso_path = None
             if self.info.iso_distro \
             and self.info.distro == self.info.iso_distro \
             and os.path.isfile(self.info.iso_path):

=== modified file 'src/wubi/backends/win32/backend.py'
--- src/wubi/backends/win32/backend.py	2011-10-11 09:30:51 +0000
+++ src/wubi/backends/win32/backend.py	2012-02-25 07:06:17 +0000
@@ -160,7 +160,11 @@
         shutil.copyfile(src, dest)
 
     def remove_existing_binary(self):
-        binary = os.path.join(self.get_startup_folder(), 'wubi.exe')
+        try:
+            binary = os.path.join(self.get_startup_folder(), 'wubi.exe')
+        except: # if the startup folder is missing, there is nothing to remove
+            return
+
         if os.path.exists(binary):
             try:
                 MOVEFILE_DELAY_UNTIL_REBOOT = 4
@@ -478,7 +482,10 @@
             if drive.type not in ('removable', 'hd'):
                 continue
             dest = join_path(drive.path, 'wubildr')
-            shutil.copyfile(src, dest)
+            try:
+                shutil.copyfile(src, dest)
+            except: # don't need to worry about failure here
+                pass
         os.unlink(src)
 
     def get_usb_search_paths(self):
@@ -741,12 +748,15 @@
             return
         log.debug("Removing bcd entry %s" % id)
         command = [bcdedit, '/delete', id , '/f']
-        run_command(command)
-        registry.set_value(
-            'HKEY_LOCAL_MACHINE',
-            self.info.registry_key,
-            'VistaBootDrive',
-            "")
+        try:
+            run_command(command)
+            registry.set_value(
+                'HKEY_LOCAL_MACHINE',
+                self.info.registry_key,
+                'VistaBootDrive',
+                "")
+        except Exception, err: #this shouldn't be fatal
+            log.error(err)
 
     def get_arch(self):
         cpuid = ctypes.windll.LoadLibrary(self.info.cpuid)