Merge lp:~bcbc/wubi/lp-862003-plus3more into lp:wubi

[bcbc]

* Correct NameError exceptions on missing attributes
  when running CD boot helper or a CD is rejected (LP: #876154).

I tested this by installing from a USB with a partition > 900,000,000 bytes so that it fails the size check. This results in a NameError on self.info.cd_path. I had to tweak some code to test this, because it ignored the size failure because it was an alpha release.
I tested the NameError on self.info.iso_path by using the "help me to boot' option from the CD boot menu (from the same USB stick). I got the NameError on rev 256 but not with my change.
------

* Ignore Permission denied when copying wubildr everywhere
  (LP: #862003)

I tested my fix by running it on Windows 7 with the Microsoft office Q: drive. I got the Permission Denied error with rev 256, but not with my version. It installed and booted successfully.
---------
* Don't fail if Windows' startup folder is missing or mis-
  configured (LP: #910948)

I have regression tested this on my Windows 7 - my fix doesn't cause any issues. I tried to rename my Startup folder but Win7 was overriding my attempts and I don't feel like breaking it just yet. The code change is pretty straightforward.
---------

* If bcdedit fails when uninstalling, it shouldn't be fatal
  (LP: #925779)

Not tested yet, but the code change is pretty straightforward.
----------------------------

[bcbc (bcbc)]

The fix I described as "Correct NameError exceptions on missing attributes when running CD boot helper or a CD is rejected (LP: #876154)." also fixes bug 891577.

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 16:32:10 +0000
+++ debian/changelog	2012-02-24 09:15:22 +0000
@@ -1,5 +1,15 @@
 wubi (12.04) UNRELEASED; urgency=low
 
+  [ 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-24 09:15:22 +0000
@@ -120,6 +120,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 +346,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 +357,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-24 09:15:22 +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)